From 3ef686652f5682c61bacfa611ef3745d51e9d976 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 19 Jul 2025 19:48:00 +0300 Subject: [PATCH] Bring things to new compile-r7rs --- Jenkinsfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 823ddc3..066d9d8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,25 +19,25 @@ pipeline { [(implementation): { stage("${implementation} install") { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - if("${implementation}" == "chicken") { - DOCKERIMG="chicken:5" - } else { - DOCKERIMG="${implementation}:head" - } + if("${implementation}" == "chicken") { + DOCKERIMG="chicken:5" + } else { + DOCKERIMG="${implementation}:head" + } sh "docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${implementation} --tag=foreign-c-test-${implementation} -f dockerfiles/Dockerfile.snow-chibi-install-test ." - sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t foreign-c-test-${implementation} sh -c \"timeout 120 make clean all install-jenkins SCHEME=${implementation} && cp tests/hello.scm /tmp/ && cd /tmp && SCHEME=${implementation} timeout 120 compile-r7rs -o hello hello.scm && timeout 120 ./hello\"" + sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t foreign-c-test-${implementation} sh -c \"timeout 120 make clean all install-jenkins SCHEME=${implementation} && cp tests/hello.scm /tmp/ && cd /tmp && SCHEME=${implementation} timeout 120 compile-r7rs -o hello hello.scm && timeout 120 printf \"\\n\"./hello\"" } } tests.each { test -> stage("${implementation} ${test}") { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - if("${implementation}" == "chicken") { - DOCKERIMG="chicken:5" - } else { - DOCKERIMG="${implementation}:head" - } + if("${implementation}" == "chicken") { + DOCKERIMG="chicken:5" + } else { + DOCKERIMG="${implementation}:head" + } sh "docker build --build-arg IMAGE=${DOCKERIMG} --build-arg SCHEME=${implementation} --tag=foreign-c-test-${implementation} -f dockerfiles/Dockerfile.test ." - sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t foreign-c-test-${implementation} sh -c \"timeout 120 make SCHEME=${implementation} TEST=${test} clean test\"" + sh "docker run -v ${WORKSPACE}:/workdir -w /workdir -t foreign-c-test-${implementation} sh -c \"timeout 120 make SCHEME=${implementation} TEST=${test} clean test\"" } } }