fix: graalvm scala3 builds (#312)

sbt · Nov 14, 2024 · 98aac05 · 98aac05
1 parent 985c682
commit 98aac05
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -83,21 +83,6 @@ jobs:
             dockerContext: 'amazoncorretto'
             baseImageTag: '17.0.13-al2023'
             platforms: 'linux/amd64'
-        exclude:
-          # https://github.com/VirtusLab/scala-cli/issues/3130
-          - scalaVersion: '3.5.2'
-            javaTag: 'graalvm-community-22.0.1'
-          - scalaVersion: '3.5.2'
-            javaTag: 'graalvm-community-21.0.2'
-          - scalaVersion: '3.5.2'
-            javaTag: 'graalvm-ce-22.3.3-b1-java17'
-          # https://github.com/VirtusLab/scala-cli/issues/2758
-          # - scalaVersion: '3.5.0'
-          #   javaTag: 'eclipse-temurin-alpine-22_36'
-          # - scalaVersion: '3.5.0'
-          #   javaTag: 'eclipse-temurin-alpine-21.0.2_13'
-          # - scalaVersion: '3.5.0'
-          #   javaTag: 'eclipse-temurin-alpine-17.0.10_7'
     steps:
     - uses: actions/checkout@v4
     - name: Set up QEMU

diff --git a/graalvm-ce/Dockerfile b/graalvm-ce/Dockerfile
@@ -19,6 +19,14 @@ ENV USER_ID=${USER_ID:-1001}
 ARG GROUP_ID
 ENV GROUP_ID=${GROUP_ID:-1001}
 
+# Install dependencies
+# ps for scala3 https://github.com/VirtusLab/scala-cli/issues/3130
+# git and rpm for sbt-native-packager (see https://github.com/sbt/docker-sbt/pull/114)
+RUN \
+  microdnf -y install procps git rpm && \
+  rm -rf /var/cache/dnf/* && \
+  microdnf clean all
+
 # Install sbt
 RUN \
   curl -fsL --show-error "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | tar xfz - -C /usr/share && \

diff --git a/graalvm-community/Dockerfile b/graalvm-community/Dockerfile
@@ -19,6 +19,14 @@ ENV USER_ID=${USER_ID:-1001}
 ARG GROUP_ID
 ENV GROUP_ID=${GROUP_ID:-1001}
 
+# Install dependencies
+# ps for scala3 https://github.com/VirtusLab/scala-cli/issues/3130
+# git and rpm for sbt-native-packager (see https://github.com/sbt/docker-sbt/pull/114)
+RUN \
+  microdnf -y install procps git rpm && \
+  rm -rf /var/cache/dnf/* && \
+  microdnf clean all
+
 # Install sbt
 RUN \
   curl -fsL --show-error "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | tar xfz - -C /usr/share && \