Upgraded: GraalVM build

kevin-lee · May 1, 2021 · 5c08eb0 · 5c08eb0
1 parent 4950cf0
commit 5c08eb0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/build-graal.yml b/.github/workflows/build-graal.yml
@@ -12,6 +12,7 @@ on:
 env:
   CLI_SCALA_VERSION: "3.0.0-RC3"
   CLI_SCALA_BINARY_VERSION: "3.0.0-RC3"
+  GRAALVM_JAVA_VERSION: "adopt@1.11"
   GRAALVM_BIN_DIR_NAME: "native-image"
 
 jobs:
@@ -34,7 +35,7 @@ jobs:
       - uses: actions/checkout@v2.3.4
       - uses: olafurpg/setup-scala@v10
         with:
-          java-version: "graalvm-ce-java11@"
+          java-version: ${{ env.GRAALVM_JAVA_VERSION }}
       - name: Cache SBT
         uses: actions/cache@v2
         with:
@@ -81,7 +82,7 @@ jobs:
       - uses: actions/checkout@v2.3.4
       - uses: olafurpg/setup-scala@v10
         with:
-          java-version: "graalvm-ce-java11@"
+          java-version: ${{ env.GRAALVM_JAVA_VERSION }}
       - uses: ilammy/msvc-dev-cmd@v1
       - name: Cache SBT
         uses: actions/cache@v2

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ env:
   GH_JAVA_VERSION: "adopt@1.11"
   CLI_SCALA_VERSION: "3.0.0-RC3"
   CLI_SCALA_BINARY_VERSION: "3.0.0-RC3"
-  GRAALVM_JAVA_VERSION: "graalvm-ce-java11@"
+  GRAALVM_JAVA_VERSION: "adopt@1.11"
   GRAALVM_BIN_DIR_NAME: "native-image"
 
 jobs:
@@ -32,9 +32,9 @@ jobs:
             ~/.ivy2/cache
             ~/.cache/coursier
             ~/.sbt
-          key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
+          key: ${{ runner.os }}-sbt-${{ env.CLI_SCALA_BINARY_VERSION }}-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
           restore-keys: |
-            ${{ runner.os }}-sbt
+            ${{ runner.os }}-sbt-${{ env.CLI_SCALA_BINARY_VERSION }}-
 
       - name: sbt GitHub Release
         env:
@@ -68,9 +68,9 @@ jobs:
             ~/.ivy2/cache
             ~/.cache/coursier
             ~/.sbt
-          key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
+          key: ${{ runner.os }}-sbt-${{ env.CLI_SCALA_BINARY_VERSION }}-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('**/build.properties') }}
           restore-keys: |
-            ${{ runner.os }}-sbt
+            ${{ runner.os }}-sbt-${{ env.CLI_SCALA_BINARY_VERSION }}-
 
       - name: "sbt ci-release - ${{ github.run_number }}"
         if: startsWith(github.ref, 'refs/tags/v')