Skip to content

Commit e0b798c

Browse files
committed
Update CI to use ubuntu-24.04
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 127f123 commit e0b798c

File tree

2 files changed

+26
-23
lines changed

2 files changed

+26
-23
lines changed

.github/workflows/bootstrap-full.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@ on: [push, pull_request]
55
env:
66
CT_ALLOW_BUILD_AS_ROOT_SURE: 1
77
DEBIAN_FRONTEND: noninteractive
8+
FORCE_UNSAFE_CONFIGURE: 1
89

910
jobs:
10-
ubuntu_23_10:
11+
ubuntu_24_04:
1112
strategy:
1213
matrix:
1314
platform: [modduo, modduo-static, modduo-new, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-x86_64]
1415
runs-on: ubuntu-latest
1516
container:
16-
image: ubuntu:23.10
17+
image: ubuntu:22.04
1718
steps:
18-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
1920
- name: Set up cache
20-
uses: actions/cache@v3
21+
uses: actions/cache@v4
2122
with:
2223
path: |
2324
~/mod-workdir/download
24-
key: download-ubuntu_23_10-${{ matrix.platform }}
25+
key: download-ubuntu_24_04-${{ matrix.platform }}
2526
- name: Install dependencies
2627
run: |
2728
apt-get update -qq && apt-get install -yqq \

.github/workflows/bootstrap-minimal.yml

+20-18
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@ on: [push, pull_request]
55
env:
66
CT_ALLOW_BUILD_AS_ROOT_SURE: 1
77
DEBIAN_FRONTEND: noninteractive
8+
FORCE_UNSAFE_CONFIGURE: 1
89

910
jobs:
1011
debian_12:
1112
strategy:
1213
matrix:
13-
platform: [modduo, modduo-new, modduo-static, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-x86_64]
14+
platform: [modduo, modduo-new, modduo-static, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-aarch64-debug, generic-x86_64]
1415
runs-on: ubuntu-latest
1516
container:
1617
image: debian:12
1718
steps:
18-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
1920
- name: Set up cache
20-
uses: actions/cache@v3
21+
uses: actions/cache@v4
2122
with:
2223
path: |
2324
~/mod-workdir/download
@@ -36,14 +37,14 @@ jobs:
3637
debian_11:
3738
strategy:
3839
matrix:
39-
platform: [modduo, modduo-new, modduo-static, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-x86_64]
40+
platform: [modduo, modduo-new, modduo-static, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-aarch64-debug, generic-x86_64]
4041
runs-on: ubuntu-latest
4142
container:
4243
image: debian:11
4344
steps:
44-
- uses: actions/checkout@v3
45+
- uses: actions/checkout@v4
4546
- name: Set up cache
46-
uses: actions/cache@v3
47+
uses: actions/cache@v4
4748
with:
4849
path: |
4950
~/mod-workdir/download
@@ -59,21 +60,22 @@ jobs:
5960
sed -i 's/CT_LOG_PROGRESS_BAR=y/CT_LOG_PROGRESS_BAR=n/' toolchain/*.config
6061
./bootstrap.sh ${{ matrix.platform }} minimal
6162
62-
ubuntu_23_10:
63+
ubuntu_24_04:
6364
strategy:
6465
matrix:
65-
platform: [modduo, modduo-new, modduo-static, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-x86_64]
66+
# platform: [modduo, modduo-new, modduo-static, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-aarch64-debug, generic-x86_64]
67+
platform: [modduo-new, modduox-new, moddwarf-new, generic-aarch64, generic-aarch64-debug, generic-x86_64]
6668
runs-on: ubuntu-latest
6769
container:
68-
image: ubuntu:23.10
70+
image: ubuntu:24.04
6971
steps:
70-
- uses: actions/checkout@v3
72+
- uses: actions/checkout@v4
7173
- name: Set up cache
72-
uses: actions/cache@v3
74+
uses: actions/cache@v4
7375
with:
7476
path: |
7577
~/mod-workdir/download
76-
key: download-ubuntu_23_10-${{ matrix.platform }}
78+
key: download-ubuntu_24_04-${{ matrix.platform }}
7779
- name: Install dependencies
7880
run: |
7981
apt-get update -qq && apt-get install -yqq \
@@ -88,14 +90,14 @@ jobs:
8890
ubuntu_22_04:
8991
strategy:
9092
matrix:
91-
platform: [modduo, modduo-new, modduo-static, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-x86_64]
93+
platform: [modduo, modduo-new, modduo-static, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-aarch64-debug, generic-x86_64]
9294
runs-on: ubuntu-latest
9395
container:
9496
image: ubuntu:22.04
9597
steps:
96-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v4
9799
- name: Set up cache
98-
uses: actions/cache@v3
100+
uses: actions/cache@v4
99101
with:
100102
path: |
101103
~/mod-workdir/download
@@ -114,14 +116,14 @@ jobs:
114116
ubuntu_20_04:
115117
strategy:
116118
matrix:
117-
platform: [modduo, modduo-new, modduo-static, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-x86_64]
119+
platform: [modduo, modduo-new, modduo-static, modduox, modduox-static, modduox-new, moddwarf, moddwarf-new, generic-aarch64, generic-aarch64-debug, generic-x86_64]
118120
runs-on: ubuntu-latest
119121
container:
120122
image: ubuntu:20.04
121123
steps:
122-
- uses: actions/checkout@v3
124+
- uses: actions/checkout@v4
123125
- name: Set up cache
124-
uses: actions/cache@v3
126+
uses: actions/cache@v4
125127
with:
126128
path: |
127129
~/mod-workdir/download

0 commit comments

Comments
 (0)