fix(ci): use JDK 18 and add settings.gradle.kts to cache inputs

android-password-store · Jun 9, 2022 · a7a5f56 · a7a5f56
1 parent c89a111
commit a7a5f56
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -24,15 +24,15 @@ jobs:
     - name: Set up JDK
       uses: actions/[email protected]
       with:
-        distribution: 'zulu'
-        java-version: '17'
-        cache: 'gradle'
+        distribution: temurin
+        java-version: 18
+        cache: gradle
 
     - name: Cache Kotlin/Native compiler
       uses: actions/[email protected]
       with:
         path: ~/.konan
-        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties', 'settings.gradle.kts') }}
 
     - name: Run unit tests
       uses: gradle/[email protected]

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,15 +29,15 @@ jobs:
     - name: Set up JDK
       uses: actions/[email protected]
       with:
-        distribution: 'zulu'
-        java-version: '17'
-        cache: 'gradle'
+        distribution: temurin
+        java-version: 18
+        cache: gradle
 
     - name: Cache Kotlin/Native compiler
       uses: actions/[email protected]
       with:
         path: ~/.konan
-        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties', 'settings.gradle.kts') }}
 
     - name: Publish
       uses: gradle/[email protected]
@@ -60,15 +60,15 @@ jobs:
     - name: Set up JDK
       uses: actions/[email protected]
       with:
-        distribution: 'zulu'
-        java-version: '17'
-        cache: 'gradle'
+        distribution: temurin
+        java-version: 18
+        cache: gradle
 
     - name: Cache Kotlin/Native compiler
       uses: actions/[email protected]
       with:
         path: ~/.konan
-        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
+        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties', 'settings.gradle.kts') }}
 
     - name: Publish Windows artifacts
       uses: gradle/[email protected]