From 85b506bbd9e4eaa9bcbcdc8512606e58768c2b2b Mon Sep 17 00:00:00 2001 From: retropikzel Date: Thu, 11 Dec 2025 10:43:05 +0200 Subject: [PATCH 1/5] Adding release builds --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index c6011bf..86ede0a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,6 +20,7 @@ pipeline { stages { stage('Build and install') { + when { not { branch 'release' } } steps { sh "make build-chibi" sh "make install" @@ -27,6 +28,7 @@ pipeline { } stage('Test') { + when { not { branch 'release' } } parallel { stage('R6RS') { steps { From f708942ae59fe9d52b0cd03873a890cded3aa699 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Thu, 11 Dec 2025 10:44:10 +0200 Subject: [PATCH 2/5] Adding release builds --- Jenkinsfile | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 86ede0a..d69ac2b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,29 +29,27 @@ pipeline { stage('Test') { when { not { branch 'release' } } - parallel { - stage('R6RS') { - steps { - script { - R7RS_SCHEMES.split().each { SCHEME -> - stage("${SCHEME} R6RS") { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "make SCHEME=${SCHEME} test-r6rs-docker" - } + stage('R6RS') { + steps { + script { + R7RS_SCHEMES.split().each { SCHEME -> + stage("${SCHEME} R6RS") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "make SCHEME=${SCHEME} test-r6rs-docker" } } } } } + } - stage('R7RS') { - steps { - script { - R7RS_SCHEMES.split().each { SCHEME -> - stage("${SCHEME} R7RS") { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "make SCHEME=${SCHEME} test-r7rs-docker" - } + stage('R7RS') { + steps { + script { + R7RS_SCHEMES.split().each { SCHEME -> + stage("${SCHEME} R7RS") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "make SCHEME=${SCHEME} test-r7rs-docker" } } } From 136b5efb602e198a554db358cecdf7d246540873 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Thu, 11 Dec 2025 10:44:55 +0200 Subject: [PATCH 3/5] Adding release builds --- Jenkinsfile | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d69ac2b..1bfc231 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,19 +3,19 @@ pipeline { agent { dockerfile { label 'docker-x86_64' - filename 'Dockerfile.jenkins' - args '--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock' + filename 'Dockerfile.jenkins' + args '--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock' } } options { disableConcurrentBuilds() - buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')) + buildDiscarder(logRotator(numToKeepStr: '10', artifactNumToKeepStr: '10')) } parameters { string(name: 'R6RS_SCHEMES', defaultValue: 'capyscheme chezscheme guile ikarus ironscheme larceny loko mosh racket sagittarius ypsilon', description: '') - string(name: 'R7RS_SCHEMES', defaultValue: 'capyscheme chibi chicken cyclone gambit foment gauche guile kawa larceny loko meevax mit-scheme mosh racket sagittarius skint stklos tr7 ypsilon', description: '') + string(name: 'R7RS_SCHEMES', defaultValue: 'capyscheme chibi chicken cyclone gambit foment gauche guile kawa larceny loko meevax mit-scheme mosh racket sagittarius skint stklos tr7 ypsilon', description: '') } stages { @@ -23,34 +23,33 @@ pipeline { when { not { branch 'release' } } steps { sh "make build-chibi" - sh "make install" + sh "make install" } } - stage('Test') { + stage('R6RS') { when { not { branch 'release' } } - stage('R6RS') { - steps { - script { - R7RS_SCHEMES.split().each { SCHEME -> - stage("${SCHEME} R6RS") { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "make SCHEME=${SCHEME} test-r6rs-docker" - } + steps { + script { + R7RS_SCHEMES.split().each { SCHEME -> + stage("${SCHEME} R6RS") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "make SCHEME=${SCHEME} test-r6rs-docker" } } } } } + } - stage('R7RS') { - steps { - script { - R7RS_SCHEMES.split().each { SCHEME -> - stage("${SCHEME} R7RS") { - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh "make SCHEME=${SCHEME} test-r7rs-docker" - } + stage('R7RS') { + when { not { branch 'release' } } + steps { + script { + R7RS_SCHEMES.split().each { SCHEME -> + stage("${SCHEME} R7RS") { + catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + sh "make SCHEME=${SCHEME} test-r7rs-docker" } } } @@ -61,7 +60,7 @@ pipeline { stage('.deb package') { steps { sh "make deb" - archiveArtifacts artifacts: '*.deb', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: true + archiveArtifacts artifacts: '*.deb', allowEmptyArchive: true, fingerprint: true, onlyIfSuccessful: true } } } From 8d7cca4a1e6d6a64eb3ab1fcbfbed6573db98423 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Thu, 11 Dec 2025 10:47:13 +0200 Subject: [PATCH 4/5] Adding release builds --- Dockerfile | 5 +++-- Makefile | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 66c7c69..4e2a157 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ -FROM debian:trixie-slim -RUN apt-get update && apt-get install -y gcc make git libffi-dev docker.io +FROM debian:trixie +RUN apt-get update && apt-get install -y \ + gcc make git libffi-dev docker.io WORKDIR /cache RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1 WORKDIR /cache/chibi-scheme diff --git a/Makefile b/Makefile index 33df427..4370abe 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,6 @@ test-r6rs: mkdir -p ${R6RSTMP} cp -r r6rs-testfiles/* ${R6RSTMP}/ cd ${R6RSTMP} && COMPILE_R7RS=${SCHEME} compile-scheme -I ./libs -o main --debug main.sps - cd ${R6RSTMP} && file main cd ${R6RSTMP} && ./main 1 2 3 > test-result.txt @grep "Test successfull (\"1\" \"2\" \"3\")" ${R6RSTMP}/test-result.txt || (echo "Test failed, output: " && cat ${R6RSTMP}/test-result.txt && exit 1) @@ -115,7 +114,6 @@ test-r7rs: mkdir -p ${R7RSTMP} cp -r r7rs-testfiles/* ${R7RSTMP}/ cd ${R7RSTMP} && COMPILE_R7RS=${SCHEME} compile-scheme -I ./libs -o main --debug main.scm - cd ${R7RSTMP} && file main -cd ${R7RSTMP} && ./main 1 2 3 > test-result.txt 2>&1 @grep "Test successfull (\"1\" \"2\" \"3\")" ${R7RSTMP}/test-result.txt || (echo "Test failed, output: " && cat ${R7RSTMP}/test-result.txt && exit 1) From 2e6ca6c98e4e8bb8725e3bb68a51c0daf52d9bcc Mon Sep 17 00:00:00 2001 From: retropikzel Date: Thu, 11 Dec 2025 10:52:35 +0200 Subject: [PATCH 5/5] Adding release builds --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1bfc231..7fec755 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { parameters { string(name: 'R6RS_SCHEMES', defaultValue: 'capyscheme chezscheme guile ikarus ironscheme larceny loko mosh racket sagittarius ypsilon', description: '') - string(name: 'R7RS_SCHEMES', defaultValue: 'capyscheme chibi chicken cyclone gambit foment gauche guile kawa larceny loko meevax mit-scheme mosh racket sagittarius skint stklos tr7 ypsilon', description: '') + string(name: 'R7RS_SCHEMES', defaultValue: 'capyscheme chibi chicken cyclone gambit foment gauche guile kawa larceny loko meevax mit-scheme mosh racket sagittarius skint stklos tr7 ypsilon', description: '') } stages { @@ -31,7 +31,7 @@ pipeline { when { not { branch 'release' } } steps { script { - R7RS_SCHEMES.split().each { SCHEME -> + R6RS_SCHEMES.split().each { SCHEME -> stage("${SCHEME} R6RS") { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { sh "make SCHEME=${SCHEME} test-r6rs-docker"