From 2f0dfdc043ebc0a25345cde354ad44d3183e7e66 Mon Sep 17 00:00:00 2001 From: Geoff Powell Date: Sun, 4 Feb 2024 08:52:28 -0500 Subject: [PATCH] Update gradle ci version and use config-cache (#94) --- .github/workflows/android.yml | 23 +++++++++++++++-------- .github/workflows/check.yml | 5 +++-- .github/workflows/desktop-web.yml | 14 +++++++++----- .github/workflows/ios.yml | 5 +++-- 4 files changed, 30 insertions(+), 17 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index d470469..331abf5 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -25,12 +25,13 @@ jobs: with: java-version: '17' distribution: 'zulu' - cache: gradle - name: Setup gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 with: gradle-home-cache-cleanup: true + cache-write-only: ${{ github.event_name == 'push' }} + cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - name: Build with Gradle run: ./gradlew composeApp:assembleDebug -Pbuild-numeber=${{ needs.build-number.outputs.build-number }} @@ -51,10 +52,13 @@ jobs: with: java-version: '17' distribution: 'zulu' - cache: gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew + - name: Setup gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-home-cache-cleanup: true + cache-write-only: ${{ github.event_name == 'push' }} + cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - name: Build with Gradle run: ./gradlew composeApp:assembleRelease -Pbuild-numeber=${{ needs.build-number.outputs.build-number }} @@ -75,10 +79,13 @@ jobs: with: java-version: '17' distribution: 'zulu' - cache: gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew + - name: Setup gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-home-cache-cleanup: true + cache-write-only: ${{ github.event_name == 'push' }} + cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - name: Build with Gradle run: ./gradlew composeApp:testDebugUnitTest \ No newline at end of file diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 55548e1..388a970 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -24,12 +24,13 @@ jobs: with: java-version: '17' distribution: 'zulu' - cache: gradle - name: Setup gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 with: gradle-home-cache-cleanup: true + cache-write-only: ${{ github.event_name == 'push' }} + cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - name: Build with Gradle run: ./gradlew spotlessCheck \ No newline at end of file diff --git a/.github/workflows/desktop-web.yml b/.github/workflows/desktop-web.yml index d2ad8a4..180ec9d 100644 --- a/.github/workflows/desktop-web.yml +++ b/.github/workflows/desktop-web.yml @@ -26,12 +26,13 @@ jobs: with: java-version: '17' distribution: 'zulu' - cache: gradle - name: Setup gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 with: gradle-home-cache-cleanup: true + cache-write-only: ${{ github.event_name == 'push' }} + cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - name: Build with Gradle run: ./gradlew composeApp:desktopJar @@ -48,10 +49,13 @@ jobs: with: java-version: '17' distribution: 'zulu' - cache: gradle - - name: Grant execute permission for gradlew - run: chmod +x gradlew + - name: Setup gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-home-cache-cleanup: true + cache-write-only: ${{ github.event_name == 'push' }} + cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - name: Setup Node uses: actions/setup-node@v4 diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 3a93b07..38c185b 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -72,12 +72,13 @@ jobs: with: java-version: '17' distribution: 'zulu' - cache: gradle - name: Setup gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 with: gradle-home-cache-cleanup: true + cache-write-only: ${{ github.event_name == 'push' }} + cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} # Update build number with the one generated from build-number.yml - uses: yanamura/ios-bump-version@v1