Skip to content

Commit 8f68f6a

Browse files
committed
Separate setup Gradle in GHActions workflows
Separating the setup of the Gradle build tool from actual build invocation is more idiomatic to GH Actions in general, and provides a clearer separation of responsibilities.
1 parent 86896a6 commit 8f68f6a

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

.github/workflows/build-verification.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ jobs:
3333
with:
3434
java-version: 11
3535
distribution: 'adopt'
36-
- uses: gradle/gradle-build-action@v2
37-
with:
38-
arguments: sanityCheck
36+
- name: Set up Gradle
37+
uses: gradle/gradle-build-action@v2
38+
- name: Run sanityCheck
39+
run: ./gradlew sanityCheck
3940

4041
android_version_tests:
4142
name: Android version tests
@@ -52,10 +53,12 @@ jobs:
5253
run: sudo test -f $ANDROID_HOME/platform-tools/api/api-versions.xml || (sudo mkdir $ANDROID_HOME/platform-tools/api && sudo cp .github/api-versions.xml $ANDROID_HOME/platform-tools/api/api-versions.xml)
5354
- name: List Android Packages
5455
run: sudo $ANDROID_HOME/tools/bin/sdkmanager --list | sed -n '/Available Packages/q;p'
55-
- uses: actions/setup-java@v2
56+
- name: Set up Java
57+
uses: actions/setup-java@v2
5658
with:
5759
java-version: 11
5860
distribution: 'adopt'
59-
- uses: gradle/gradle-build-action@v2
60-
with:
61-
arguments: testAndroid${{ matrix.versions }} -x signArchives
61+
- name: Set up Gradle
62+
uses: gradle/gradle-build-action@v2
63+
- name: Build and test
64+
run: ./gradlew testAndroid${{ matrix.versions }} -x signArchives

.github/workflows/wrapper-upgrade-execution.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131
with:
3232
java-version: '11'
3333
distribution: 'adopt'
34-
- name: Upgrade Wrappers
34+
- name: Set up Gradle
3535
uses: gradle/gradle-build-action@v2
36-
with:
37-
arguments: 'clean upgradeGradleWrapperAll --continue'
36+
- name: Upgrade Wrappers
37+
run: ./gradlew clean upgradeGradleWrapperAll --continue
3838
env:
3939
WRAPPER_UPGRADE_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)