From 5470cf98ca886b6a1b30ad007ce377fd9bc7b8ff Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 13 Apr 2024 13:14:25 +0100 Subject: [PATCH 1/4] Migrate legacy Gradle actions to the new official `gradle/actions` --- .github/workflows/Build.yaml | 13 ++++++++++--- .github/workflows/Release.yml | 7 ++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index db326c3803..d8161ccf63 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v2 + uses: gradle/actions/wrapper-validation-action@v3 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -38,7 +38,9 @@ jobs: java-version: 17 - name: Setup Gradle - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 + with: + gradle-home-cache-cleanup: true - name: Check build-logic run: ./gradlew check -p build-logic @@ -170,6 +172,9 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Validate Gradle Wrapper + uses: gradle/actions/wrapper-validation-action@v3 + - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -180,7 +185,9 @@ jobs: java-version: 17 - name: Setup Gradle - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 + with: + gradle-home-cache-cleanup: true - name: Build projects and run instrumentation tests uses: reactivecircus/android-emulator-runner@v2 diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 7de3cb11e7..d54e9494e3 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v4 - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v2 + uses: gradle/actions/wrapper-validation-action@v3 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -33,6 +33,11 @@ jobs: distribution: 'zulu' java-version: 17 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v3 + with: + gradle-home-cache-cleanup: true + - name: Install GMD image for baseline profile generation run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64" From 44e673b52ee9e6c732ed1fe090967a80777cc031 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 13 Apr 2024 13:24:13 +0100 Subject: [PATCH 2/4] Fix typo --- .github/workflows/Build.yaml | 4 ++-- .github/workflows/Release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index d8161ccf63..43c7f3ee9e 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation-action@v3 + uses: gradle/actions/wrapper-validation@v3 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -173,7 +173,7 @@ jobs: uses: actions/checkout@v4 - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation-action@v3 + uses: gradle/actions/wrapper-validation@v3 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index d54e9494e3..f6b48bf6f9 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v4 - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation-action@v3 + uses: gradle/actions/wrapper-validation@v3 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties From be1a2b28e0ce3f7c5a6ec20b3be46f3a124f6a6b Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sun, 14 Apr 2024 22:19:29 +0100 Subject: [PATCH 3/4] Configure `validate-wrappers: true` with `gradle/actions/setup-gradle` --- .github/workflows/Build.yaml | 8 ++------ .github/workflows/Release.yml | 6 ++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml index 43c7f3ee9e..d1ead0e509 100644 --- a/.github/workflows/Build.yaml +++ b/.github/workflows/Build.yaml @@ -25,9 +25,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@v3 - - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -40,6 +37,7 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 with: + validate-wrappers: true gradle-home-cache-cleanup: true - name: Check build-logic @@ -172,9 +170,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@v3 - - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -187,6 +182,7 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 with: + validate-wrappers: true gradle-home-cache-cleanup: true - name: Build projects and run instrumentation tests diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index f6b48bf6f9..e50d05e538 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -19,10 +19,7 @@ jobs: ls /dev/kvm - name: Checkout - uses: actions/checkout@v4 - - - name: Validate Gradle Wrapper - uses: gradle/actions/wrapper-validation@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -36,6 +33,7 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 with: + validate-wrappers: true gradle-home-cache-cleanup: true - name: Install GMD image for baseline profile generation From f22b543f1a9af4e2b8e482d14dc1090adabba741 Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Tue, 16 Apr 2024 21:58:59 +0200 Subject: [PATCH 4/4] trigger