Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit ab798d7

Browse files
msfjarvismsfjarvis
authored
fix(ci): remove build-tools workaround
 No longer necessary since AGP now uses build-tools 34.0.0
1 parent 7675641 commit ab798d7

9 files changed

+0
-210
lines changed

‎.github/workflows/codeql_analysis.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,6 @@ jobs:
2424
- name: Checkout repository
2525
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
2626

27-
- name: Accept all SDK licenses
28-
shell: bash
29-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
30-
31-
- name: Get build-tools directory
32-
id: build-tools-path
33-
shell: bash
34-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
35-
36-
- name: Cache build-tools
37-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
38-
with:
39-
path: ${{ steps.build-tools-path.outputs.dir }}
40-
key: ${{ runner.os }}-34.0.0
41-
4227
- name: Set up JDK
4328
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
4429
with:

‎.github/workflows/deploy_github_releases.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,6 @@ jobs:
1212
- name: Checkout repository
1313
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
1414

15-
- name: Accept all SDK licenses
16-
shell: bash
17-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
18-
19-
- name: Get build-tools directory
20-
id: build-tools-path
21-
shell: bash
22-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
23-
24-
- name: Cache build-tools
25-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
26-
with:
27-
path: ${{ steps.build-tools-path.outputs.dir }}
28-
key: ${{ runner.os }}-34.0.0
29-
3015
- name: Set up JDK
3116
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
3217
with:

‎.github/workflows/deploy_library_releases.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,6 @@ jobs:
1111
- name: Checkout repository
1212
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
1313

14-
- name: Accept all SDK licenses
15-
shell: bash
16-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
17-
18-
- name: Get build-tools directory
19-
id: build-tools-path
20-
shell: bash
21-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
22-
23-
- name: Cache build-tools
24-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
25-
with:
26-
path: ${{ steps.build-tools-path.outputs.dir }}
27-
key: ${{ runner.os }}-34.0.0
28-
2914
- name: Set up JDK
3015
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
3116
with:

‎.github/workflows/deploy_snapshot.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,6 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525

26-
- name: Accept all SDK licenses
27-
shell: bash
28-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
29-
30-
- name: Get build-tools directory
31-
id: build-tools-path
32-
shell: bash
33-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
34-
35-
- name: Cache build-tools
36-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
37-
with:
38-
path: ${{ steps.build-tools-path.outputs.dir }}
39-
key: ${{ runner.os }}-34.0.0
40-
4126
- name: Set up JDK
4227
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
4328
with:

‎.github/workflows/draft_new_release.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,6 @@ jobs:
3636
with:
3737
ref: ${{ env.CHECKOUT_REF }}
3838

39-
- name: Accept all SDK licenses
40-
shell: bash
41-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
42-
43-
- name: Get build-tools directory
44-
id: build-tools-path
45-
shell: bash
46-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
47-
48-
- name: Cache build-tools
49-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
50-
with:
51-
path: ${{ steps.build-tools-path.outputs.dir }}
52-
key: ${{ runner.os }}-34.0.0
53-
5439
- name: Set up JDK
5540
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
5641
with:

‎.github/workflows/pull_request.yml

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,6 @@ jobs:
4141
with:
4242
fetch-depth: 0
4343

44-
- name: Accept all SDK licenses
45-
shell: bash
46-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
47-
48-
- name: Get build-tools directory
49-
id: build-tools-path
50-
shell: bash
51-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
52-
53-
- name: Cache build-tools
54-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
55-
with:
56-
path: ${{ steps.build-tools-path.outputs.dir }}
57-
key: ${{ runner.os }}-34.0.0
58-
5944
- name: Set up JDK
6045
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
6146
with:
@@ -87,21 +72,6 @@ jobs:
8772
with:
8873
fetch-depth: 0
8974

90-
- name: Accept all SDK licenses
91-
shell: bash
92-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
93-
94-
- name: Get build-tools directory
95-
id: build-tools-path
96-
shell: bash
97-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
98-
99-
- name: Cache build-tools
100-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
101-
with:
102-
path: ${{ steps.build-tools-path.outputs.dir }}
103-
key: ${{ runner.os }}-34.0.0
104-
10575
- name: Set up JDK
10676
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
10777
with:
@@ -140,21 +110,6 @@ jobs:
140110
with:
141111
fetch-depth: 0
142112

143-
- name: Accept all SDK licenses
144-
shell: bash
145-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
146-
147-
- name: Get build-tools directory
148-
id: build-tools-path
149-
shell: bash
150-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
151-
152-
- name: Cache build-tools
153-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
154-
with:
155-
path: ${{ steps.build-tools-path.outputs.dir }}
156-
key: ${{ runner.os }}-34.0.0
157-
158113
- name: Set up JDK
159114
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
160115
with:
@@ -186,21 +141,6 @@ jobs:
186141
with:
187142
fetch-depth: 0
188143

189-
- name: Accept all SDK licenses
190-
shell: bash
191-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
192-
193-
- name: Get build-tools directory
194-
id: build-tools-path
195-
shell: bash
196-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
197-
198-
- name: Cache build-tools
199-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
200-
with:
201-
path: ${{ steps.build-tools-path.outputs.dir }}
202-
key: ${{ runner.os }}-34.0.0
203-
204144
- name: Set up JDK
205145
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
206146
with:
@@ -232,21 +172,6 @@ jobs:
232172
with:
233173
fetch-depth: 0
234174

235-
- name: Accept all SDK licenses
236-
shell: bash
237-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
238-
239-
- name: Get build-tools directory
240-
id: build-tools-path
241-
shell: bash
242-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
243-
244-
- name: Cache build-tools
245-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
246-
with:
247-
path: ${{ steps.build-tools-path.outputs.dir }}
248-
key: ${{ runner.os }}-34.0.0
249-
250175
- name: Set up JDK
251176
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
252177
with:
@@ -278,21 +203,6 @@ jobs:
278203
with:
279204
fetch-depth: 0
280205

281-
- name: Accept all SDK licenses
282-
shell: bash
283-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
284-
285-
- name: Get build-tools directory
286-
id: build-tools-path
287-
shell: bash
288-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
289-
290-
- name: Cache build-tools
291-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
292-
with:
293-
path: ${{ steps.build-tools-path.outputs.dir }}
294-
key: ${{ runner.os }}-34.0.0
295-
296206
- name: Set up JDK
297207
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
298208
with:

‎.github/workflows/shadow_job.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,6 @@ jobs:
3838
with:
3939
fetch-depth: 0
4040

41-
- name: Accept all SDK licenses
42-
shell: bash
43-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
44-
45-
- name: Get build-tools directory
46-
id: build-tools-path
47-
shell: bash
48-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
49-
50-
- name: Cache build-tools
51-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
52-
with:
53-
path: ${{ steps.build-tools-path.outputs.dir }}
54-
key: ${{ runner.os }}-34.0.0
55-
5641
- name: Set up JDK
5742
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
5843
with:

‎.github/workflows/sync_crowdin.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,6 @@ jobs:
1111
- name: Checkout
1212
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
1313

14-
- name: Accept all SDK licenses
15-
shell: bash
16-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
17-
18-
- name: Get build-tools directory
19-
id: build-tools-path
20-
shell: bash
21-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
22-
23-
- name: Cache build-tools
24-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
25-
with:
26-
path: ${{ steps.build-tools-path.outputs.dir }}
27-
key: ${{ runner.os }}-34.0.0
28-
2914
- name: Set up JDK
3015
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
3116
with:

‎.github/workflows/update_publicsuffix_data.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,6 @@ jobs:
1111
- name: Checkout
1212
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
1313

14-
- name: Accept all SDK licenses
15-
shell: bash
16-
run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
17-
18-
- name: Get build-tools directory
19-
id: build-tools-path
20-
shell: bash
21-
run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0" >> "${GITHUB_OUTPUT}"
22-
23-
- name: Cache build-tools
24-
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
25-
with:
26-
path: ${{ steps.build-tools-path.outputs.dir }}
27-
key: ${{ runner.os }}-34.0.0
28-
2914
- name: Set up JDK
3015
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
3116
with:

0 commit comments

Comments
 (0)