Skip to content

Commit c37dd7d

Browse files
authored
Merge pull request #1375 from SimonMarquis/gradle-actions
Migrate legacy Gradle actions to the new official `gradle/actions`
2 parents 644e618 + 6c4dbc5 commit c37dd7d

File tree

2 files changed

+15
-8
lines changed

2 files changed

+15
-8
lines changed

.github/workflows/Build.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ jobs:
2525
- name: Checkout
2626
uses: actions/checkout@v4
2727

28-
- name: Validate Gradle Wrapper
29-
uses: gradle/wrapper-validation-action@v3
30-
3128
- name: Copy CI gradle.properties
3229
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
3330

@@ -38,7 +35,10 @@ jobs:
3835
java-version: 17
3936

4037
- name: Setup Gradle
41-
uses: gradle/gradle-build-action@v3
38+
uses: gradle/actions/setup-gradle@v3
39+
with:
40+
validate-wrappers: true
41+
gradle-home-cache-cleanup: true
4242

4343
- name: Check build-logic
4444
run: ./gradlew check -p build-logic
@@ -187,7 +187,10 @@ jobs:
187187
java-version: 17
188188

189189
- name: Setup Gradle
190-
uses: gradle/gradle-build-action@v3
190+
uses: gradle/actions/setup-gradle@v3
191+
with:
192+
validate-wrappers: true
193+
gradle-home-cache-cleanup: true
191194

192195
- name: Build projects and run instrumentation tests
193196
uses: reactivecircus/android-emulator-runner@v2

.github/workflows/Release.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@ jobs:
1919
ls /dev/kvm
2020
2121
- name: Checkout
22-
uses: actions/checkout@v4
2322

24-
- name: Validate Gradle Wrapper
25-
uses: gradle/wrapper-validation-action@v3
23+
uses: actions/checkout@v4
2624

2725
- name: Copy CI gradle.properties
2826
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -33,6 +31,12 @@ jobs:
3331
distribution: 'zulu'
3432
java-version: 17
3533

34+
- name: Setup Gradle
35+
uses: gradle/actions/setup-gradle@v3
36+
with:
37+
validate-wrappers: true
38+
gradle-home-cache-cleanup: true
39+
3640
- name: Install GMD image for baseline profile generation
3741
run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64"
3842

0 commit comments

Comments
 (0)