From eb042024104ca9ff6271f595f0699d5ea2c4435b Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 30 Aug 2022 22:08:46 +0530 Subject: Enable new gradle-home-cache-cleanup option (#2096) --- .github/workflows/deploy_github_releases.yml | 1 + .github/workflows/deploy_library_releases.yml | 2 ++ .github/workflows/deploy_snapshot.yml | 1 + .github/workflows/draft_new_release.yml | 5 +++++ .github/workflows/pull_request.yml | 31 ++++++++++++++++---------- .github/workflows/shadow_job.yml | 1 + .github/workflows/sync_crowdin.yml | 16 +++++++++++-- .github/workflows/update_publicsuffix_data.yml | 5 +++-- 8 files changed, 46 insertions(+), 16 deletions(-) (limited to '.github/workflows') diff --git a/.github/workflows/deploy_github_releases.yml b/.github/workflows/deploy_github_releases.yml index 856ea85e..aa7191b4 100644 --- a/.github/workflows/deploy_github_releases.yml +++ b/.github/workflows/deploy_github_releases.yml @@ -30,6 +30,7 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: :app:assembleFreeRelease :app:assembleNonFreeRelease :app:bundleNonFreeRelease + gradle-home-cache-cleanup: true env: SENTRY_DSN: ${{ secrets.SENTRY_DSN }} diff --git a/.github/workflows/deploy_library_releases.yml b/.github/workflows/deploy_library_releases.yml index b6df960a..6dd0d845 100644 --- a/.github/workflows/deploy_library_releases.yml +++ b/.github/workflows/deploy_library_releases.yml @@ -21,6 +21,7 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: --no-configuration-cache :autofill-parser:publishAllPublicationsToMavenCentralRepository + gradle-home-cache-cleanup: true env: ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.NEXUS_PUBLISH_USERNAME }} ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.NEXUS_PUBLISH_PASSWORD }} @@ -31,6 +32,7 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: --no-configuration-cache closeAndReleaseRepository + gradle-home-cache-cleanup: true env: ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.NEXUS_PUBLISH_USERNAME }} ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.NEXUS_PUBLISH_PASSWORD }} diff --git a/.github/workflows/deploy_snapshot.yml b/.github/workflows/deploy_snapshot.yml index a44deae7..6ffa190c 100644 --- a/.github/workflows/deploy_snapshot.yml +++ b/.github/workflows/deploy_snapshot.yml @@ -36,6 +36,7 @@ jobs: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} with: arguments: collectFreeReleaseApks collectNonFreeReleaseApks -PsentryUploadMappings + gradle-home-cache-cleanup: true - name: Clean secrets run: scripts/signing-cleanup.sh diff --git a/.github/workflows/draft_new_release.yml b/.github/workflows/draft_new_release.yml index ecea149a..55e6b4c8 100644 --- a/.github/workflows/draft_new_release.yml +++ b/.github/workflows/draft_new_release.yml @@ -47,6 +47,11 @@ jobs: with: version: ${{ github.event.milestone.title }} + - name: Setup Gradle caching + uses: gradle/gradle-build-action@v2.3.0 + with: + gradle-home-cache-cleanup: true + - name: Initialize git config and commit changes shell: bash run: | diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index c8172767..02aec897 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -43,13 +43,14 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: spotlessCheck + gradle-home-cache-cleanup: true - name: Upload Kotlin build report if: "${{ always() }}" uses: actions/upload-artifact@v3.1.0 with: - name: Build report - path: build/reports/kotlin-build/ + name: Build report + path: build/reports/kotlin-build/ unit-tests: runs-on: ubuntu-latest @@ -84,6 +85,7 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: test -PslimTests + gradle-home-cache-cleanup: true - name: (Fail-only) Upload test report if: "${{ failure() }}" @@ -96,8 +98,8 @@ jobs: if: "${{ always() }}" uses: actions/upload-artifact@v3.1.0 with: - name: Build report - path: build/reports/kotlin-build/ + name: Build report + path: build/reports/kotlin-build/ build-apks: runs-on: ubuntu-latest @@ -132,13 +134,14 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: assembleFreeDebug assembleNonFreeDebug + gradle-home-cache-cleanup: true - name: Upload Kotlin build report if: "${{ always() }}" uses: actions/upload-artifact@v3.1.0 with: - name: Build report - path: build/reports/kotlin-build/ + name: Build report + path: build/reports/kotlin-build/ check-api: runs-on: ubuntu-latest @@ -173,13 +176,14 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: apiCheck + gradle-home-cache-cleanup: true - name: Upload Kotlin build report if: "${{ always() }}" uses: actions/upload-artifact@v3.1.0 with: - name: Build report - path: build/reports/kotlin-build/ + name: Build report + path: build/reports/kotlin-build/ lint-debug: runs-on: ubuntu-latest @@ -214,13 +218,14 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: lintDebug + gradle-home-cache-cleanup: true - name: Upload Kotlin build report if: "${{ always() }}" uses: actions/upload-artifact@v3.1.0 with: - name: Build report - path: build/reports/kotlin-build/ + name: Build report + path: build/reports/kotlin-build/ assemble-release-apks: runs-on: ubuntu-latest @@ -255,13 +260,14 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: aNFR + gradle-home-cache-cleanup: true - name: Upload Kotlin build report if: "${{ always() }}" uses: actions/upload-artifact@v3.1.0 with: - name: Build report - path: build/reports/kotlin-build/ + name: Build report + path: build/reports/kotlin-build/ detekt: runs-on: ubuntu-latest @@ -296,6 +302,7 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: detekt + gradle-home-cache-cleanup: true - name: Upload Kotlin build report if: "${{ always() }}" diff --git a/.github/workflows/shadow_job.yml b/.github/workflows/shadow_job.yml index d4ef9c81..8c2dd36a 100644 --- a/.github/workflows/shadow_job.yml +++ b/.github/workflows/shadow_job.yml @@ -46,3 +46,4 @@ jobs: DEP_OVERRIDE_agp: ${{ matrix.agp-version }} with: arguments: check + gradle-home-cache-cleanup: true diff --git a/.github/workflows/sync_crowdin.yml b/.github/workflows/sync_crowdin.yml index ef49a402..f16d250e 100644 --- a/.github/workflows/sync_crowdin.yml +++ b/.github/workflows/sync_crowdin.yml @@ -2,7 +2,7 @@ name: Sync localisations from Crowdin on: workflow_dispatch: schedule: - - cron: '0 0 * * 6' + - cron: '0 0 * * 0' jobs: sync-crowdin: @@ -21,6 +21,7 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: --no-configuration-cache crowdin + gradle-home-cache-cleanup: true env: CROWDIN_LOGIN: ${{ secrets.CROWDIN_LOGIN }} CROWDIN_PROJECT_KEY: ${{ secrets.CROWDIN_PROJECT_KEY }} @@ -30,10 +31,10 @@ jobs: run: if [[ $(git diff --stat) != '' ]]; then echo "UPDATED=true" >> $GITHUB_ENV; fi - name: Create Pull Request + id: cpr uses: peter-evans/create-pull-request@v4.1.1 if: "env.UPDATED == 'true'" with: - assignees: msfjarvis author: GitHub Actions base: develop body: This is an automated pull request to sync localisations from Crowdin. @@ -42,3 +43,14 @@ jobs: labels: A-localisation, P-low, S-waiting-on-review title: Sync localisations from Crowdin token: ${{ secrets.GITHUB_TOKEN }} + + - name: Close, re-open and enable squash merge for PR + if: "${{ steps.cpr.outputs.pull-request-operation == 'created' }}" + shell: bash + run: | + gh pr close "${PR_URL}" + gh pr reopen "${PR_URL}" + gh pr merge --squash --auto "${PR_URL}" + env: + GITHUB_TOKEN: ${{ secrets.PSL_UPDATE_TOKEN }} + PR_URL: ${{ steps.cpr.outputs.pull-request-url }} diff --git a/.github/workflows/update_publicsuffix_data.yml b/.github/workflows/update_publicsuffix_data.yml index fe3fcca9..d90157df 100644 --- a/.github/workflows/update_publicsuffix_data.yml +++ b/.github/workflows/update_publicsuffix_data.yml @@ -2,7 +2,7 @@ name: Update Publix Suffix List data on: workflow_dispatch: schedule: - - cron: "0 0 * * 6" + - cron: "0 0 * * 1" jobs: update-publicsuffix-data: @@ -21,6 +21,7 @@ jobs: uses: gradle/gradle-build-action@v2.3.0 with: arguments: updatePSL + gradle-home-cache-cleanup: true - name: Compare list changes run: if [[ $(git diff --binary --stat) != "" ]]; then echo "UPDATED=true" >> $GITHUB_ENV; fi @@ -30,13 +31,13 @@ jobs: if: "${{ env.UPDATED == 'true' }}" with: arguments: :autofill-parser:test -PslimTests + gradle-home-cache-cleanup: true - name: Create Pull Request id: cpr uses: peter-evans/create-pull-request@v4.1.1 if: "${{ env.UPDATED == 'true' }}" with: - assignees: msfjarvis author: GitHub Actions base: develop body: This is an automated pull request to update the publicsuffixes file to the latest copy from Mozilla -- cgit v1.2.3