Updating tests

Dockerfile.test

@@ -1,26 +1,22 @@
 ARG SCHEME=chibi
-ARG IMAGE=chibi:head
+ARG IMAGE=${SCHEME}:head
-FROM schemers/${IMAGE}
+FROM debian:trixie-slim AS cache
-FROM debian:trixie AS build
+RUN apt-get update && apt-get install -y make gcc git
-WORKDIR /cache/debs
+WORKDIR /cache
-RUN apt-get update && apt-get install \
+RUN git clone https://github.com/ashinn/chibi-scheme.git --depth=1
-    -y \
+RUN cd chibi-scheme && make
-    --no-install-recommends \
-    --no-install-suggests \
-    --download-only \
-    gcc libffi-dev libc-dev make linux-libc-dev
-RUN cp -r /var/cache/apt/archives/*.deb .
 
 ARG SCHEME=chibi
-ARG IMAGE=chibi:head
+ARG IMAGE=${SCHEME}:head
 FROM schemers/${IMAGE}
-RUN mkdir -p ${HOME}/.snow && echo "()" > ${HOME}/.snow/config.scm
+RUN apt-get update && apt-get install -y make gcc libffi-dev
-COPY --from=build /cache /cache
-WORKDIR /cache/debs
-RUN dpkg -i *.deb
 COPY --from=retropikzel1/compile-r7rs /opt/compile-r7rs /opt/compile-r7rs
-ENV PATH=/opt/compile-r7rs/bin:${PATH}
+COPY --from=cache /cache /cache
-WORKDIR /
+WORKDIR /cache/chibi-scheme
-ARG SCHEME=chibi
+RUN make -j8 install
+WORKDIR /workdir
 ENV COMPILE_R7RS=${SCHEME}
+ENV PATH=/opt/compile-r7rs/bin:${PATH}
+ARG SCHEME=chibi
+RUN snow-chibi install --always-yes --impls=${SCHEME} "(srfi 64)"
 

Makefile

@@ -5,6 +5,10 @@ VERSION=0.10.7
 CC=gcc
 TMPDIR=.tmp
 
+ifeq "${SCHEME}" "chicken"
+DOCKERIMG=${SCHEME}:5
+endif
+
 all: package
 
 package: README.html