From 817a6e29334d9b137a5add1bc8dddd180825b280 Mon Sep 17 00:00:00 2001 From: retropikzel Date: Sat, 19 Jul 2025 19:14:29 +0300 Subject: [PATCH] Bring things to new compile-r7rs --- Jenkinsfile | 5 +++++ Makefile | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5ed5d08..823ddc3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,6 +31,11 @@ pipeline { tests.each { test -> stage("${implementation} ${test}") { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { + 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\"" } diff --git a/Makefile b/Makefile index ed6f73e..4ce12d8 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ TEST=primitives SCHEME=chibi TMPDIR=tmp/${SCHEME} DOCKERIMG=${SCHEME}:head -ifeq "${SCHEME}" "chicken:5" -DOCKERIMG=${SCHEME} +ifeq "${SCHEME}" "chicken" +DOCKERIMG="chicken:5" endif all: build ${TMPDIR}