Skip to content

Commit 2da923d

Browse files
committed
Update all machines to ubuntu-24.04
1 parent 896effd commit 2da923d

File tree

2 files changed

+26
-94
lines changed

2 files changed

+26
-94
lines changed

.github/workflows/build-android-toolchain.yml

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ on:
1313
jobs:
1414

1515
build-swift-android-arm-64:
16-
runs-on: ubuntu-20.04
17-
container: ubuntu:focal
16+
runs-on: ubuntu-24.04
17+
container: ubuntu:noble
1818

1919
steps:
2020
- uses: actions/checkout@v1
2121
- name: Install dependencies
22-
run: ./build/000-install-dependencies.sh
22+
run: ./build/000-install-dependencies-nobel.sh
2323
- name: Install NDK
2424
run: ./build/002-install-ndk.sh
2525
- name: Define build folders
@@ -42,13 +42,13 @@ jobs:
4242

4343

4444
build-swift-android-armeabi-v7a:
45-
runs-on: ubuntu-20.04
46-
container: ubuntu:focal
45+
runs-on: ubuntu-24.04
46+
container: ubuntu:noble
4747

4848
steps:
4949
- uses: actions/checkout@v1
5050
- name: Install dependencies
51-
run: ./build/000-install-dependencies.sh
51+
run: ./build/000-install-dependencies-nobel.sh
5252
- name: Install NDK
5353
run: ./build/002-install-ndk.sh
5454
- name: Define build folders
@@ -71,13 +71,13 @@ jobs:
7171

7272

7373
build-swift-android-x86_64:
74-
runs-on: ubuntu-20.04
75-
container: ubuntu:focal
74+
runs-on: ubuntu-24.04
75+
container: ubuntu:noble
7676

7777
steps:
7878
- uses: actions/checkout@v1
7979
- name: Install dependencies
80-
run: ./build/000-install-dependencies.sh
80+
run: ./build/000-install-dependencies-nobel.sh
8181
- name: Install NDK
8282
run: ./build/002-install-ndk.sh
8383
- name: Define build folders
@@ -100,8 +100,8 @@ jobs:
100100

101101

102102
build-openssl-android:
103-
runs-on: ubuntu-20.04
104-
container: ubuntu:focal
103+
runs-on: ubuntu-24.04
104+
container: ubuntu:noble
105105

106106
steps:
107107
- uses: actions/checkout@v1
@@ -117,7 +117,7 @@ jobs:
117117
key: openssl-1.1.1w-r4
118118
- name: Install dependencies
119119
if: steps.cache-openssl.outputs.cache-hit != 'true'
120-
run: ./build/000-install-dependencies.sh
120+
run: ./build/000-install-dependencies-nobel.sh
121121
- name: Install NDK
122122
if: steps.cache-openssl.outputs.cache-hit != 'true'
123123
run: ./build/002-install-ndk.sh
@@ -147,8 +147,8 @@ jobs:
147147

148148
build-curl-android:
149149
needs: [build-openssl-android]
150-
runs-on: ubuntu-20.04
151-
container: ubuntu:focal
150+
runs-on: ubuntu-24.04
151+
container: ubuntu:noble
152152

153153
steps:
154154
- uses: actions/checkout@v1
@@ -164,7 +164,7 @@ jobs:
164164
key: curl-7_88_1-r10
165165
- name: Install dependencies
166166
if: steps.cache-curl.outputs.cache-hit != 'true'
167-
run: ./build/000-install-dependencies.sh
167+
run: ./build/000-install-dependencies-nobel.sh
168168
- name: Install NDK
169169
if: steps.cache-curl.outputs.cache-hit != 'true'
170170
run: ./build/002-install-ndk.sh
@@ -255,13 +255,13 @@ jobs:
255255

256256
build-swift-corelibs-android-arm-64:
257257
needs: [build-openssl-android, build-curl-android, build-libxml-android, build-swift-android-arm-64]
258-
runs-on: ubuntu-20.04
259-
container: ubuntu:focal
258+
runs-on: ubuntu-24.04
259+
container: ubuntu:noble
260260

261261
steps:
262262
- uses: actions/checkout@v1
263263
- name: Install dependencies
264-
run: ./build/000-install-dependencies.sh
264+
run: ./build/000-install-dependencies-nobel.sh
265265
- name: Install NDK
266266
run: ./build/002-install-ndk.sh
267267
- name: Define build folders
@@ -301,13 +301,13 @@ jobs:
301301

302302
build-swift-corelibs-android-armeabi-v7a:
303303
needs: [build-openssl-android, build-curl-android, build-libxml-android, build-swift-android-armeabi-v7a]
304-
runs-on: ubuntu-20.04
305-
container: ubuntu:focal
304+
runs-on: ubuntu-24.04
305+
container: ubuntu:noble
306306

307307
steps:
308308
- uses: actions/checkout@v1
309309
- name: Install dependencies
310-
run: ./build/000-install-dependencies.sh
310+
run: ./build/000-install-dependencies-nobel.sh
311311
- name: Install NDK
312312
run: ./build/002-install-ndk.sh
313313
- name: Define build folders
@@ -343,13 +343,13 @@ jobs:
343343

344344
build-swift-corelibs-android-x86_64:
345345
needs: [build-openssl-android, build-curl-android, build-libxml-android, build-swift-android-x86_64]
346-
runs-on: ubuntu-20.04
347-
container: ubuntu:focal
346+
runs-on: ubuntu-24.04
347+
container: ubuntu:noble
348348

349349
steps:
350350
- uses: actions/checkout@v1
351351
- name: Install dependencies
352-
run: ./build/000-install-dependencies.sh
352+
run: ./build/000-install-dependencies-nobel.sh
353353
- name: Install NDK
354354
run: ./build/002-install-ndk.sh
355355
- name: Define build folders
@@ -385,7 +385,8 @@ jobs:
385385

386386
collect-mac-x86_64-toolchain:
387387
needs: [build-swift-corelibs-android-arm-64, build-swift-corelibs-android-armeabi-v7a, build-swift-corelibs-android-x86_64]
388-
runs-on: ubuntu-20.04
388+
runs-on: ubuntu-24.04
389+
container: ubuntu:noble
389390

390391
steps:
391392
- uses: actions/checkout@v1

build/000-install-dependencies.sh

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)