Skip to content

Commit bec4c64

Browse files
mlykotommlykotom
authored
Merge pull request #465 from Goooler/tweak-gha-configs
Speed up CI
2 parents 9f89fb2 + 8e4bde2 commit bec4c64

22 files changed

+98
-233
lines changed

‎.github/workflows/AccessibilityCodelab.yaml

+4-11
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ on:
77
- end
88
paths:
99
- 'AccessibilityCodelab/**'
10+
- '.github/workflows/AccessibilityCodelab.yaml'
1011
pull_request:
1112
paths:
1213
- 'AccessibilityCodelab/**'
14+
- '.github/workflows/AccessibilityCodelab.yaml'
1315

1416
env:
1517
SAMPLE_PATH: AccessibilityCodelab
@@ -24,24 +26,15 @@ jobs:
2426
uses: actions/checkout@v4
2527

2628
- name: Copy CI gradle.properties
27-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
29+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2830

2931
- name: Set up JDK 17
3032
uses: actions/setup-java@v4
3133
with:
3234
distribution: 'zulu'
3335
java-version: 17
3436

35-
- name: Generate cache key
36-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
37-
38-
- uses: actions/cache@v4
39-
with:
40-
path: |
41-
~/.gradle/caches/modules-*
42-
~/.gradle/caches/jars-*
43-
~/.gradle/caches/build-cache-*
44-
key: gradle-${{ hashFiles('checksum.txt') }}
37+
- uses: gradle/actions/setup-gradle@v3
4538

4639
- name: Build project
4740
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml

+5-21
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ on:
66
- main
77
paths:
88
- 'AdvancedStateAndSideEffectsCodelab/**'
9+
- '.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml'
910
pull_request:
1011
paths:
1112
- 'AdvancedStateAndSideEffectsCodelab/**'
13+
- '.github/workflows/AdvancedStateAndSideEffectsCodelab.yaml'
1214

1315
env:
1416
SAMPLE_PATH: AdvancedStateAndSideEffectsCodelab
@@ -31,16 +33,7 @@ jobs:
3133
distribution: 'zulu'
3234
java-version: 17
3335

34-
- name: Generate cache key
35-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
36-
37-
- uses: actions/cache@v4
38-
with:
39-
path: |
40-
~/.gradle/caches/modules-*
41-
~/.gradle/caches/jars-*
42-
~/.gradle/caches/build-cache-*
43-
key: gradle-${{ hashFiles('checksum.txt') }}
36+
- uses: gradle/actions/setup-gradle@v3
4437

4538
- name: Build project
4639
working-directory: ${{ env.SAMPLE_PATH }}
@@ -75,7 +68,7 @@ jobs:
7568
sudo udevadm control --reload-rules
7669
sudo udevadm trigger --name-match=kvm
7770
ls /dev/kvm
78-
71+
7972
- name: Checkout
8073
uses: actions/checkout@v4
8174

@@ -88,16 +81,7 @@ jobs:
8881
distribution: 'zulu'
8982
java-version: 17
9083

91-
- name: Generate cache key
92-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
93-
94-
- uses: actions/cache@v4
95-
with:
96-
path: |
97-
~/.gradle/caches/modules-*
98-
~/.gradle/caches/jars-*
99-
~/.gradle/caches/build-cache-*
100-
key: gradle-${{ hashFiles('checksum.txt') }}
84+
- uses: gradle/actions/setup-gradle@v3
10185

10286
- name: Run instrumentation tests
10387
uses: reactivecircus/android-emulator-runner@v2

‎.github/workflows/AnimationCodelab.yaml

+4-11
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ on:
66
- main
77
paths:
88
- 'AnimationCodelab/**'
9+
- '.github/workflows/AnimationCodelab.yaml'
910
pull_request:
1011
paths:
1112
- 'AnimationCodelab/**'
13+
- '.github/workflows/AnimationCodelab.yaml'
1214

1315
env:
1416
SAMPLE_PATH: AnimationCodelab
@@ -23,24 +25,15 @@ jobs:
2325
uses: actions/checkout@v4
2426

2527
- name: Copy CI gradle.properties
26-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
28+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2729

2830
- name: Set up JDK 17
2931
uses: actions/setup-java@v4
3032
with:
3133
distribution: 'zulu'
3234
java-version: 17
3335

34-
- name: Generate cache key
35-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
36-
37-
- uses: actions/cache@v4
38-
with:
39-
path: |
40-
~/.gradle/caches/modules-*
41-
~/.gradle/caches/jars-*
42-
~/.gradle/caches/build-cache-*
43-
key: gradle-${{ hashFiles('checksum.txt') }}
36+
- uses: gradle/actions/setup-gradle@v3
4437

4538
- name: Build project
4639
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/BasicLayoutsCodelab.yaml

+4-11
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ on:
66
- main
77
paths:
88
- 'BasicLayoutsCodelab/**'
9+
- '.github/workflows/BasicLayoutsCodelab.yaml'
910
pull_request:
1011
paths:
1112
- 'BasicLayoutsCodelab/**'
13+
- '.github/workflows/BasicLayoutsCodelab.yaml'
1214

1315
env:
1416
SAMPLE_PATH: BasicLayoutsCodelab
@@ -23,24 +25,15 @@ jobs:
2325
uses: actions/checkout@v4
2426

2527
- name: Copy CI gradle.properties
26-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
28+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2729

2830
- name: Set up JDK 17
2931
uses: actions/setup-java@v4
3032
with:
3133
distribution: 'zulu'
3234
java-version: 17
3335

34-
- name: Generate cache key
35-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
36-
37-
- uses: actions/cache@v4
38-
with:
39-
path: |
40-
~/.gradle/caches/modules-*
41-
~/.gradle/caches/jars-*
42-
~/.gradle/caches/build-cache-*
43-
key: gradle-${{ hashFiles('checksum.txt') }}
36+
- uses: gradle/actions/setup-gradle@v3
4437

4538
- name: Build project
4639
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/BasicStateCodelab.yaml

+4-11
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ on:
66
- main
77
paths:
88
- 'BasicStateCodelab/**'
9+
- '.github/workflows/BasicStateCodelab.yaml'
910
pull_request:
1011
paths:
1112
- 'BasicStateCodelab/**'
13+
- '.github/workflows/BasicStateCodelab.yaml'
1214

1315
env:
1416
SAMPLE_PATH: BasicStateCodelab
@@ -23,24 +25,15 @@ jobs:
2325
uses: actions/checkout@v4
2426

2527
- name: Copy CI gradle.properties
26-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
28+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2729

2830
- name: Set up JDK 17
2931
uses: actions/setup-java@v4
3032
with:
3133
distribution: 'zulu'
3234
java-version: 17
3335

34-
- name: Generate cache key
35-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
36-
37-
- uses: actions/cache@v4
38-
with:
39-
path: |
40-
~/.gradle/caches/modules-*
41-
~/.gradle/caches/jars-*
42-
~/.gradle/caches/build-cache-*
43-
key: gradle-${{ hashFiles('checksum.txt') }}
36+
- uses: gradle/actions/setup-gradle@v3
4437

4538
- name: Build project
4639
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/BasicsCodelab.yaml

+4-11
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ on:
66
- main
77
paths:
88
- 'BasicsCodelab/**'
9+
- '.github/workflows/BasicsCodelab.yaml'
910
pull_request:
1011
paths:
1112
- 'BasicsCodelab/**'
13+
- '.github/workflows/BasicsCodelab.yaml'
1214

1315
env:
1416
SAMPLE_PATH: BasicsCodelab
@@ -23,24 +25,15 @@ jobs:
2325
uses: actions/checkout@v4
2426

2527
- name: Copy CI gradle.properties
26-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
28+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2729

2830
- name: Set up JDK 17
2931
uses: actions/setup-java@v4
3032
with:
3133
distribution: 'zulu'
3234
java-version: 17
3335

34-
- name: Generate cache key
35-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
36-
37-
- uses: actions/cache@v4
38-
with:
39-
path: |
40-
~/.gradle/caches/modules-*
41-
~/.gradle/caches/jars-*
42-
~/.gradle/caches/build-cache-*
43-
key: gradle-${{ hashFiles('checksum.txt') }}
36+
- uses: gradle/actions/setup-gradle@v3
4437

4538
- name: Build project
4639
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/MigrationCodelab.yaml

+14-22
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ on:
66
- main
77
paths:
88
- 'MigrationCodelab/**'
9+
- '.github/workflows/MigrationCodelab.yaml'
910
pull_request:
1011
paths:
1112
- 'MigrationCodelab/**'
13+
- '.github/workflows/MigrationCodelab.yaml'
1214

1315
env:
1416
SAMPLE_PATH: MigrationCodelab
@@ -23,24 +25,15 @@ jobs:
2325
uses: actions/checkout@v4
2426

2527
- name: Copy CI gradle.properties
26-
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
28+
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
2729

2830
- name: Set up JDK 17
2931
uses: actions/setup-java@v4
3032
with:
3133
distribution: 'zulu'
3234
java-version: 17
3335

34-
- name: Generate cache key
35-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
36-
37-
- uses: actions/cache@v4
38-
with:
39-
path: |
40-
~/.gradle/caches/modules-*
41-
~/.gradle/caches/jars-*
42-
~/.gradle/caches/build-cache-*
43-
key: gradle-${{ hashFiles('checksum.txt') }}
36+
- uses: gradle/actions/setup-gradle@v3
4437

4538
- name: Build project
4639
working-directory: ${{ env.SAMPLE_PATH }}
@@ -68,9 +61,17 @@ jobs:
6861
api-level: [26, 29]
6962

7063
steps:
64+
# https://github.blog/changelog/2023-02-23-hardware-accelerated-android-virtualization-on-actions-windows-and-linux-larger-hosted-runners
65+
- name: Enable KVM group perms
66+
run: |
67+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
68+
sudo udevadm control --reload-rules
69+
sudo udevadm trigger --name-match=kvm
70+
ls /dev/kvm
71+
7172
- name: Checkout
7273
uses: actions/checkout@v4
73-
74+
7475
- name: Copy CI gradle.properties
7576
run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
7677

@@ -80,16 +81,7 @@ jobs:
8081
distribution: 'zulu'
8182
java-version: 17
8283

83-
- name: Generate cache key
84-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
85-
86-
- uses: actions/cache@v4
87-
with:
88-
path: |
89-
~/.gradle/caches/modules-*
90-
~/.gradle/caches/jars-*
91-
~/.gradle/caches/build-cache-*
92-
key: gradle-${{ hashFiles('checksum.txt') }}
84+
- uses: gradle/actions/setup-gradle@v3
9385

9486
- name: Run instrumentation tests
9587
uses: reactivecircus/android-emulator-runner@v2

‎.github/workflows/NavigationCodelab.yaml

+3-10
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ on:
77
- end
88
paths:
99
- 'NavigationCodelab/**'
10+
- '.github/workflows/NavigationCodelab.yaml'
1011
pull_request:
1112
paths:
1213
- 'NavigationCodelab/**'
14+
- '.github/workflows/NavigationCodelab.yaml'
1315

1416
env:
1517
SAMPLE_PATH: NavigationCodelab
@@ -32,16 +34,7 @@ jobs:
3234
distribution: 'zulu'
3335
java-version: 17
3436

35-
- name: Generate cache key
36-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
37-
38-
- uses: actions/cache@v4
39-
with:
40-
path: |
41-
~/.gradle/caches/modules-*
42-
~/.gradle/caches/jars-*
43-
~/.gradle/caches/build-cache-*
44-
key: gradle-${{ hashFiles('checksum.txt') }}
37+
- uses: gradle/actions/setup-gradle@v3
4538

4639
- name: Build project
4740
working-directory: ${{ env.SAMPLE_PATH }}

‎.github/workflows/TestingCodelab.yaml

+3-10
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ on:
77
- end
88
paths:
99
- 'TestingCodelab/**'
10+
- '.github/workflows/TestingCodelab.yaml'
1011
pull_request:
1112
paths:
1213
- 'TestingCodelab/**'
14+
- '.github/workflows/TestingCodelab.yaml'
1315

1416
env:
1517
SAMPLE_PATH: TestingCodelab
@@ -32,16 +34,7 @@ jobs:
3234
distribution: 'zulu'
3335
java-version: 17
3436

35-
- name: Generate cache key
36-
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
37-
38-
- uses: actions/cache@v4
39-
with:
40-
path: |
41-
~/.gradle/caches/modules-*
42-
~/.gradle/caches/jars-*
43-
~/.gradle/caches/build-cache-*
44-
key: gradle-${{ hashFiles('checksum.txt') }}
37+
- uses: gradle/actions/setup-gradle@v3
4538

4639
- name: Build project
4740
working-directory: ${{ env.SAMPLE_PATH }}

0 commit comments

Comments
 (0)