aboutsummaryrefslogtreecommitdiffstats
path: root/Jenkinsfile
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Jenkinsfile35
1 files changed, 18 insertions, 17 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 83be0ac..f7f66c7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,35 +2,35 @@ pipeline {
agent any
stages {
- stage('Build Docker Image') {
+ stage('Build Application Image') {
steps {
script {
- echo 'Building the Docker image...'
- // Build the Docker image from the Dockerfile.jenkins in the current directory
- // and tag it as 'lush-arch-test'
- sh 'docker build -f Dockerfile.jenkins -t lush-arch-test .'
+ echo 'Building the Lush application Docker image...'
+ // Build the image from the new Dockerfile and tag it
+ sh 'docker build -t lush-app:latest .'
}
}
}
- stage('Run Tests in Container') {
+ stage('Compile Project in Container') {
steps {
script {
- echo 'Running tests inside the Docker container...'
- // Run the container with the 'lush-arch-test' image.
- // The CMD in the Dockerfile will be executed.
- // --rm automatically removes the container when it exits.
- sh 'docker run --rm lush-arch-test'
+ echo 'Compiling the Lush project inside the container...'
+ // Run the container to generate Makefiles and compile
+ // We mount the current directory to get the compiled artifacts back out
+ sh 'docker run --rm -v "$(pwd)":/app lush-app:latest'
+ sh 'docker run --rm -v "$(pwd)":/app lush-app:latest make'
}
}
}
- stage('Run Owner-Provided Test Script') {
+ stage('Run Lua 5.2 Compatibility Test') {
steps {
script {
echo 'Running the Lua 5.2 compatibility test script...'
- // First, create the test script file
+ // Create the test script file
sh '''
cat <<'EOF' > test_52.lua
-- Lua 5.2-specific features
+ print("--- Running Lua 5.2 Compatibility Test ---")
local _ENV = { print = print, x = 123 } -- lexical environments
function show_x()
print("x =", x)
@@ -45,11 +45,12 @@ pipeline {
-- table.pack / table.unpack
local t = table.pack(1, 2, 3, nil, 5)
print("Packed length:", t.n)
- print("Unpacked values:", table.unpack(t))
+ print("Unpacked values:", table.unpack(t, 1, t.n))
+ print("--- Test Complete ---")
EOF
'''
- // Run the container and execute the owner's test script
- sh 'docker run --rm -v $(pwd)/test_52.lua:/app/test_52.lua lush-arch-test ./bin/Debug/lush/lush test_52.lua'
+ // Run the container and execute the test script with the compiled binary
+ sh 'docker run --rm -v "$(pwd)":/app lush-app:latest ./bin/Debug/lush/lush test_52.lua'
}
}
}
@@ -58,7 +59,7 @@ pipeline {
always {
echo 'Pipeline finished.'
// Clean up the created docker image to save space
- sh 'docker rmi lush-arch-test || true'
+ sh 'docker rmi lush-app:latest || true'
}
}
}
84c48c395293d4e5d2eb0af0?s=13&d=retro' width='13' height='13' alt='Gravatar' /> Christoph Lohmann 3-11/+84 In config.h there is now some styles array to apply site-specific styles. This can be toggled using the -mM flags. If a stylefile is manually specified, then this will overwrite everything. 2015-01-02Fix a typo in surf manual.Gravatar Jakukyo Friel 1-1/+1 `Ctrl-/` displays incorrectly in `man surf` on my machine. A patch is attached. (You also access it here: https://github.com/weakish/surf/commit/07e97eccedd96eabf14b2fbf77de75ec1b594d97) ---- surf.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Christoph Lohmann <20h@r-36.net> 2014-09-28Minor style change.Gravatar Christoph Lohmann 1-1/+1 2014-09-28Make »Copy image address« work.Gravatar Christoph Lohmann 1-3/+10 Thanks yui@blekksprut.net for the patch! 2014-08-07Mention xdotool in SEE ALSO too.Gravatar Christoph Lohmann 1-1/+2 2014-08-07Fix the manpage about xid.Gravatar Christoph Lohmann 1-1/+3 Something was missing from this one sentence. Now it is complete.