Use Guile 3.0

codello · Feb 11, 2024 · 05fe148 · 05fe148
1 parent 90a287a
commit 05fe148
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -92,7 +92,9 @@ jobs:
           push: false
           load: true
           tags: ${{ env.IMAGE }}:${{ matrix.version }}
-          build-args: VERSION=${{ matrix.version }}
+          build-args: |
+            VERSION=${{ matrix.version }}
+            GUILE_VERSION=${{ matrix.guile }}
       - name: Test Image
         env:
           VERSION: ${{ matrix.version }}
@@ -107,4 +109,6 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: VERSION=${{ matrix.version }}
+          build-args: |
+            VERSION=${{ matrix.version }}
+            GUILE_VERSION=${{ matrix.guile }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,13 @@
 ARG VERSION
 ARG BASE=ubuntu:jammy
+ARG GUILE_VERSION=2.2
 
 ########################################################################################
 # Build LilyPond on the latest Ubuntu. Unfortunately compiling does not work on alpine.
 ########################################################################################
 FROM $BASE AS build
 ARG VERSION
+ARG GUILE_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 ENV PATH="/opt/bin:$PATH" PKG_CONFIG_PATH="/opt/lib/pkgconfig:$PKG_CONFIG_PATH"
 
@@ -15,7 +17,7 @@ RUN apt-get -qq --yes update && \
     # See https://lilypond.org/doc/v2.23/Documentation/contributor/requirements-for-compiling-lilypond#other
     apt-get -qq --yes install \
         build-essential \
-        guile-2.2-dev \
+        guile-$GUILE_VERSION-dev \
         python3-dev \
         autoconf \
         pkg-config \
@@ -69,11 +71,12 @@ RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula selec
 ########################################################################################
 FROM $BASE
 ARG VERSION
+ARG GUILE_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get -qq --yes update && \
     apt-get -qq --yes install \
-        guile-2.2 \
+        guile-$GUILE_VERSION \
         libcairo2 \
         libfontconfig1 \
         libfreetype6 \

diff --git a/versions.json b/versions.json
@@ -1,13 +1,15 @@
 {
   "2.24": {
     "version": "2.24.3",
+    "guile": "2.2",
     "tags": [
       "latest",
       "stable"
     ]
   },
   "2.25": {
     "version": "2.25.13",
+    "guile": "3.0",
     "tags": [
       "dev"
     ]