Skip to content

Commit b4f146c

Browse files
kikosokikoso
committed
refactor: changed flows
1 parent 854123e commit b4f146c

File tree

3 files changed

+64
-105
lines changed

3 files changed

+64
-105
lines changed

‎.github/workflows/build.yml‎

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,100 +32,92 @@ jobs:
3232
timeout-minutes: 45
3333

3434
steps:
35-
- uses: actions/checkout@v2
35+
- uses: actions/checkout@v4
3636

3737
- name: set up Java 21
38-
uses: actions/setup-java@v2
38+
uses: actions/setup-java@v4
3939
with:
4040
distribution: 'adopt'
4141
java-version: '21'
4242

4343
- name: Build and check
4444
run: |
45-
cd ApiDemos
46-
for dir in ./*/ ; do
47-
if [[ "$dir" != "./resources/" ]]; then
48-
( cd "$dir" && ./gradlew buildDebugPreBundle )
49-
fi
50-
done
45+
./gradlew :ApiDemos:java-app:assembleDebug
46+
./gradlew :ApiDemos:kotlin-app:assembleDebug
47+
./gradlew :ApiDemos:common-ui:assembleDebug
5148
5249
5350
build-WearOS:
5451
runs-on: ubuntu-latest
5552
timeout-minutes: 45
5653

5754
steps:
58-
- uses: actions/checkout@v2
55+
- uses: actions/checkout@v4
5956

6057
- name: set up Java 21
61-
uses: actions/setup-java@v2
58+
uses: actions/setup-java@v4
6259
with:
6360
distribution: 'adopt'
6461
java-version: '21'
6562

6663
- name: Build and check
67-
run: cd WearOS && ./gradlew build
64+
run: ./gradlew :WearOS:Wearable:assembleDebug
6865

6966
build-FireMarkers:
7067
runs-on: ubuntu-latest
7168
timeout-minutes: 45
7269

7370
steps:
74-
- uses: actions/checkout@v2
71+
- uses: actions/checkout@v4
7572

7673
- name: set up Java 21
77-
uses: actions/setup-java@v2
74+
uses: actions/setup-java@v4
7875
with:
7976
distribution: 'adopt'
8077
java-version: '21'
8178

8279
- name: Build and check
83-
run: cd FireMarkers && ./gradlew build
80+
run: ./gradlew :FireMarkers:app:assembleDebug
8481

8582
build-Snippets:
8683
runs-on: ubuntu-latest
8784
timeout-minutes: 45
8885

8986
steps:
90-
- uses: actions/checkout@v2
87+
- uses: actions/checkout@v4
9188

9289
- name: set up Java 21
93-
uses: actions/setup-java@v2
90+
uses: actions/setup-java@v4
9491
with:
9592
distribution: 'adopt'
9693
java-version: '21'
9794

9895
- name: Build and check
9996
run: |
100-
cd snippets
101-
./gradlew assembleDebug lintDebug
97+
./gradlew :snippets:app:assembleDebug
98+
./gradlew :snippets:app-ktx:assembleDebug
99+
./gradlew :snippets:app-utils-ktx:assembleDebug
100+
./gradlew :snippets:app-compose:assembleDebug
101+
./gradlew :snippets:app-places-ktx:assembleDebug
102+
./gradlew :snippets:app-rx:assembleDebug
103+
./gradlew :snippets:app-utils:assembleDebug
102104
103105
build-tutorials:
104106
runs-on: ubuntu-latest
105107
timeout-minutes: 45
106108

107109
steps:
108-
- uses: actions/checkout@v2
110+
- uses: actions/checkout@v4
109111

110112
- name: set up Java 21
111-
uses: actions/setup-java@v2
113+
uses: actions/setup-java@v4
112114
with:
113115
distribution: 'adopt'
114116
java-version: '21'
115117

116118
- name: Build and check
117119
run: |
118-
cd tutorials
119-
for dir in ./*/
120-
do
121-
cd "$dir"
122-
for tutorial in ./*/
123-
do
124-
cd "$tutorial" && ./gradlew buildDebug
125-
cd ..
126-
done
127-
cd ..
128-
done
120+
./gradlew :tutorials:kotlin:Polygons:assembleDebug
129121
130122
test: # used as required status check
131123
runs-on: ubuntu-latest

‎.github/workflows/generate-v3.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,27 @@ jobs:
2525
timeout-minutes: 45
2626

2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v4
2929

30-
- name: set up JDK 1.8
31-
uses: actions/setup-java@v1
30+
- name: set up JDK 17
31+
uses: actions/setup-java@v4
3232
with:
33-
java-version: 1.8
33+
distribution: 'adopt'
34+
java-version: 17
3435

3536
- name: Install NDK
3637
run: |
37-
sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;20.0.5594570"
38+
sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;20.0.5594570"
3839
3940
- name: Generate V3
4041
id: gradlew-generate-v3
4142
run: |
42-
cd ApiDemos/java
43-
./gradlew generateV3 generateV3Layout
44-
cd ../kotlin
45-
./gradlew generateV3 generateV3Layout
46-
echo "::set-output name=files-changed::$(git status -s | wc -l)"
43+
./gradlew :ApiDemos:java-app:generateV3 :ApiDemos:java-app:generateV3Layout
44+
./gradlew :ApiDemos:kotlin-app:generateV3 :ApiDemos:kotlin-app:generateV3Layout
45+
echo "files-changed=$(git status -s | wc -l)" >> $GITHUB_OUTPUT
4746
4847
- name: PR Changes
49-
uses: peter-evans/create-pull-request@v2
48+
uses: peter-evans/create-pull-request@v6
5049
if: steps.gradlew-generate-v3.outputs.files-changed > 0
5150
with:
5251
token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}
@@ -57,6 +56,7 @@ jobs:
5756
body: |
5857
Generating V3 code via `./gradlew generateV3 generateV3Layout`
5958
branch: googlemaps-bot/generate-v3
59+
6060
- name: Uninstall NDK
6161
run: |
62-
${ANDROID_HOME}/tools/bin/sdkmanager --uninstall 'ndk-bundle'
62+
${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --uninstall 'ndk;20.0.5594570'

‎.github/workflows/lint.yml‎

Lines changed: 29 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -25,129 +25,96 @@ jobs:
2525

2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
- name: Set up JDK 17
31-
uses: actions/setup-java@v3
31+
uses: actions/setup-java@v4
3232
with:
3333
distribution: 'adopt'
3434
java-version: '17'
3535

36-
- name: Run Android Lint for ApiDemos/project/kotlin-app
37-
run: ./gradlew :kotlin-app:lintDebug
38-
working-directory: ApiDemos/project
39-
40-
- name: Upload SARIF for ApiDemos/project/kotlin-app
36+
- name: Run Android Lint
37+
run: |
38+
./gradlew :ApiDemos:kotlin-app:lintDebug
39+
./gradlew :ApiDemos:java-app:lintDebug
40+
./gradlew :ApiDemos:common-ui:lintDebug
41+
./gradlew :snippets:app:lintGmsDebug
42+
./gradlew :snippets:app-utils:lintDebug
43+
./gradlew :snippets:app-utils-ktx:lintDebug
44+
./gradlew :snippets:app-rx:lintDebug
45+
./gradlew :snippets:app-places-ktx:lintDebug
46+
./gradlew :snippets:app-ktx:lintDebug
47+
./gradlew :snippets:app-compose:lintDebug
48+
./gradlew :WearOS:Wearable:lintDebug
49+
./gradlew :FireMarkers:app:lintDebug
50+
51+
- name: Upload SARIF for ApiDemos:kotlin-app
4152
uses: github/codeql-action/upload-sarif@v3
4253
with:
4354
sarif_file: ApiDemos/project/kotlin-app/build/reports/lint-results-debug.sarif
4455
category: ApiDemos-kotlin-app
4556

46-
- name: Run Android Lint for ApiDemos/project/java-app
47-
run: ./gradlew :java-app:lintDebug
48-
working-directory: ApiDemos/project
49-
50-
- name: Upload SARIF for ApiDemos/project/java-app
57+
- name: Upload SARIF for ApiDemos:java-app
5158
uses: github/codeql-action/upload-sarif@v3
5259
with:
5360
sarif_file: ApiDemos/project/java-app/build/reports/lint-results-debug.sarif
5461
category: ApiDemos-java-app
5562

56-
- name: Run Android Lint for ApiDemos/project/common-ui
57-
run: ./gradlew :common-ui:lintDebug
58-
working-directory: ApiDemos/project
59-
60-
- name: Upload SARIF for ApiDemos/project/common-ui
63+
- name: Upload SARIF for ApiDemos:common-ui
6164
uses: github/codeql-action/upload-sarif@v3
6265
with:
6366
sarif_file: ApiDemos/project/common-ui/build/reports/lint-results-debug.sarif
6467
category: ApiDemos-common-ui
6568

66-
- name: Run Android Lint for snippets/app
67-
run: ./gradlew :app:lintGmsDebug
68-
working-directory: snippets
69-
70-
- name: Upload SARIF for snippets/app
69+
- name: Upload SARIF for snippets:app
7170
uses: github/codeql-action/upload-sarif@v3
7271
with:
7372
sarif_file: snippets/app/build/reports/lint-results-debug.sarif
7473
category: snippets-app
7574

76-
- name: Run Android Lint for snippets/app-utils
77-
run: ./gradlew :app-utils:lintDebug
78-
working-directory: snippets
79-
80-
- name: Upload SARIF for snippets/app-utils
75+
- name: Upload SARIF for snippets:app-utils
8176
uses: github/codeql-action/upload-sarif@v3
8277
with:
8378
sarif_file: snippets/app-utils/build/reports/lint-results-debug.sarif
8479
category: snippets-app-utils
8580

86-
- name: Run Android Lint for snippets/app-utils-ktx
87-
run: ./gradlew :app-utils-ktx:lintDebug
88-
working-directory: snippets
89-
90-
- name: Upload SARIF for snippets/app-utils-ktx
81+
- name: Upload SARIF for snippets:app-utils-ktx
9182
uses: github/codeql-action/upload-sarif@v3
9283
with:
9384
sarif_file: snippets/app-utils-ktx/build/reports/lint-results-debug.sarif
9485
category: snippets-app-utils-ktx
9586

96-
- name: Run Android Lint for snippets/app-rx
97-
run: ./gradlew :app-rx:lintDebug
98-
working-directory: snippets
99-
100-
- name: Upload SARIF for snippets/app-rx
87+
- name: Upload SARIF for snippets:app-rx
10188
uses: github/codeql-action/upload-sarif@v3
10289
with:
10390
sarif_file: snippets/app-rx/build/reports/lint-results-debug.sarif
10491
category: snippets-app-rx
10592

106-
- name: Run Android Lint for snippets/app-places-ktx
107-
run: ./gradlew :app-places-ktx:lintDebug
108-
working-directory: snippets
109-
110-
- name: Upload SARIF for snippets/app-places-ktx
93+
- name: Upload SARIF for snippets:app-places-ktx
11194
uses: github/codeql-action/upload-sarif@v3
11295
with:
11396
sarif_file: snippets/app-places-ktx/build/reports/lint-results-debug.sarif
11497
category: snippets-app-places-ktx
11598

116-
- name: Run Android Lint for snippets/app-ktx
117-
run: ./gradlew :app-ktx:lintDebug
118-
working-directory: snippets
119-
120-
- name: Upload SARIF for snippets/app-ktx
99+
- name: Upload SARIF for snippets:app-ktx
121100
uses: github/codeql-action/upload-sarif@v3
122101
with:
123102
sarif_file: snippets/app-ktx/build/reports/lint-results-debug.sarif
124103
category: snippets-app-ktx
125104

126-
- name: Run Android Lint for snippets/app-compose
127-
run: ./gradlew :app-compose:lintDebug
128-
working-directory: snippets
129-
130-
- name: Upload SARIF for snippets/app-compose
105+
- name: Upload SARIF for snippets:app-compose
131106
uses: github/codeql-action/upload-sarif@v3
132107
with:
133108
sarif_file: snippets/app-compose/build/reports/lint-results-debug.sarif
134109
category: snippets-app-compose
135110

136-
- name: Run Android Lint for WearOS/Wearable
137-
run: ./gradlew :Wearable:lintDebug
138-
working-directory: WearOS
139-
140-
- name: Upload SARIF for WearOS/Wearable
111+
- name: Upload SARIF for WearOS:Wearable
141112
uses: github/codeql-action/upload-sarif@v3
142113
with:
143114
sarif_file: WearOS/Wearable/build/reports/lint-results-debug.sarif
144115
category: WearOS-Wearable
145116

146-
- name: Run Android Lint for FireMarkers/app
147-
run: ./gradlew :app:lintDebug
148-
working-directory: FireMarkers
149-
150-
- name: Upload SARIF for FireMarkers/app
117+
- name: Upload SARIF for FireMarkers:app
151118
uses: github/codeql-action/upload-sarif@v3
152119
with:
153120
sarif_file: FireMarkers/app/build/reports/lint-results-debug.sarif

0 commit comments

Comments
 (0)