ci: use java version from catalog

aya-prover · Sep 26, 2023 · 2117142 · 2117142
1 parent 08d1524
commit 2117142
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/.github/workflows/gradle-check.yml b/.github/workflows/gradle-check.yml
@@ -7,15 +7,19 @@ on:
   merge_group:
     types: [checks_requested]
 jobs:
+  check-aya-version:
+    uses: aya-prover/aya-dev/.github/workflows/extract-version.yaml@main
+
   gradle-check:
+    needs: [check-aya-version]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Setup Java 20
         uses: actions/setup-java@v3
         with:
           distribution: 'liberica'
-          java-version: '20'
+          java-version: ${{ needs.check-aya-version.outputs.javaVersion }}
       - uses: gradle/gradle-build-action@v2
         with:
           arguments: testCodeCoverageReport --no-daemon --stacktrace --warning-mode all

diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -17,19 +17,7 @@ jobs:
           BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
   check-aya-version:
-    runs-on: ubuntu-latest
-    outputs:
-      isSnapshot: ${{ steps.check.outputs.isSnapshot }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Check snapshot version
-        id: check
-        run: |
-          ver="$(cat ./gradle/deps.properties | grep "version.project" | cut -d'=' -f2)"
-          isSnapshot="$(echo "$ver" | grep -q "SNAPSHOT" && echo true || echo false)"
-          echo "Detected Project Version: $ver"
-          echo "Detected Project Version is a SNAPSHOT: $isSnapshot"
-          echo "::set-output name=isSnapshot::${isSnapshot}"
+    uses: aya-prover/aya-dev/.github/workflows/extract-version.yaml@main
 
   publish-snapshot:
     needs: [check-aya-version]
@@ -44,14 +32,14 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'liberica'
-          java-version: '20'
+          java-version: ${{ needs.check-aya-version.outputs.javaVersion }}
       - name: gradle publish
         uses: gradle/gradle-build-action@v2
         with:
           arguments: publish --info --no-daemon --stacktrace --warning-mode all
 
   nightly-build:
-    needs: [move-tag]
+    needs: [move-tag, check-aya-version]
     runs-on: ${{ matrix.os }}
     env:
       nativeName: aya-prover_native_${{ matrix.platform }}${{ matrix.binaryExt }}
@@ -76,7 +64,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'liberica'
-          java-version: '20'
+          java-version: ${{ needs.check-aya-version.outputs.javaVersion }}
 
       - name: Run task jlinkAyaZip
         uses: gradle/gradle-build-action@v2
@@ -93,7 +81,7 @@ jobs:
       - name: Setup GraalVM
         uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '20'
+          java-version: ${{ needs.check-aya-version.outputs.javaVersion }}
           distribution: 'graalvm-community'
           components: 'native-image'
           set-java-home: 'false'

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,9 +4,9 @@
 # After that, increase the version number and add "-SNAPSHOT" suffix back for next cycle.
 project = "0.30-SNAPSHOT"
 
-# Remember to update .github/workflows/{nightly-build.yml, gradle-check.yml}
 # https://openjdk.org/
 java = "20"
+
 # https://github.com/JetBrains/java-annotations
 annotations = "24.0.1"
 kala = "0.67.0"