From a7a5f5686df12ed579b25337bcdbfe687a15803d Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 9 Jun 2022 23:09:36 +0530 Subject: [PATCH] fix(ci): use JDK 18 and add `settings.gradle.kts` to cache inputs --- .github/workflows/check.yml | 8 ++++---- .github/workflows/release.yml | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index a9dc8c2..b454a90 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -24,15 +24,15 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3.3.0 with: - distribution: 'zulu' - java-version: '17' - cache: 'gradle' + distribution: temurin + java-version: 18 + cache: gradle - name: Cache Kotlin/Native compiler uses: actions/cache@v3.0.4 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/gradle-build-action@v2.2.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 34604ee..4ac4aa3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,15 +29,15 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3.3.0 with: - distribution: 'zulu' - java-version: '17' - cache: 'gradle' + distribution: temurin + java-version: 18 + cache: gradle - name: Cache Kotlin/Native compiler uses: actions/cache@v3.0.4 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/gradle-build-action@v2.2.0 @@ -60,15 +60,15 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3.3.0 with: - distribution: 'zulu' - java-version: '17' - cache: 'gradle' + distribution: temurin + java-version: 18 + cache: gradle - name: Cache Kotlin/Native compiler uses: actions/cache@v3.0.4 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/gradle-build-action@v2.2.0