Merge pull request #1 from scheme-containers/dev/ypsilon

ypsilon: Use the upstream repository
scheme-containers · Oct 2, 2023 · 2669116 · 2669116
2 parents 1848ec3 + 0f4e44f
commit 2669116
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/ypsilon-push-action.yml b/.github/workflows/ypsilon-push-action.yml
@@ -25,12 +25,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
-        name: Build and push schemers/ypsilon:head-lambdaconservatory
+        name: Build and push schemers/ypsilon:head
         uses: docker/build-push-action@v2
         with:
           push: true
-          context: implementations/ypsilon/head-lambdaconservatory/
+          context: implementations/ypsilon/head/
           tags: |
-            schemers/ypsilon:head-lambdaconservatory
-            schemers/ypsilon:head-lambdaconservatory-bullseye-slim
+            schemers/ypsilon:head
+            schemers/ypsilon:head-bullseye-slim
             schemers/ypsilon:latest
diff --git a/...psilon/head-lambdaconservatory/Dockerfile → implementations/ypsilon/head/Dockerfile b/...psilon/head-lambdaconservatory/Dockerfile → implementations/ypsilon/head/Dockerfile
@@ -7,9 +7,13 @@ RUN apt-get update && apt-get -y --no-install-recommends install \
       git \
       libffi-dev \
       libgmp-dev \
+      llvm \
+      clang \
+      llvm-dev \
+      lld \
  && rm -rf /var/lib/apt/lists/*
 WORKDIR /build/
-RUN git clone https://github.com/lambdaconservatory/ypsilon.git --depth 1
+RUN git clone https://github.com/fujita-y/ypsilon.git --depth 1
 WORKDIR /build/ypsilon
 RUN make
 RUN make check
@@ -19,6 +23,7 @@ FROM debian:bullseye-slim
 RUN apt-get update && apt-get -y --no-install-recommends install \
       libffi7 \
       libgmp10 \
+      libllvm11 \
  && rm -rf /var/lib/apt/lists/*
 COPY --from=build /usr/local/ /usr/local/
 COPY scheme-script /usr/local/bin

diff --git a/...lon/head-lambdaconservatory/scheme-script → implementations/ypsilon/head/scheme-script b/...lon/head-lambdaconservatory/scheme-script → implementations/ypsilon/head/scheme-script
diff --git a/scripts/implementations.scm b/scripts/implementations.scm
@@ -394,8 +394,8 @@
 (define-implementation
   (name "ypsilon")
   (versions (version
-             (name "head-lambdaconservatory")
-             (tags "head-lambdaconservatory"
-                   "head-lambdaconservatory-bullseye-slim"
+             (name "head")
+             (tags "head"
+                   "head-bullseye-slim"
                    "latest"))))