Skip to content

Commit 44dfd9e

Browse files
committed
ci: Update to Ubuntu 22.04 LTS
Note: The LTS image is still in beta (actions/runner-images#5490). In Jammy, we have recent versions of zypper and dnf packaged so we don't have to build them from source anymore. Also, sq is packaged so we don't have to build sq from source anymore either. The setup-github-actions.sh script is renamed to setup-pacman.sh and it's reduced to only install the dependencies necessary to build pacman and archlinux-keyring. All other dependencies are moved to action.yaml and the action mkosi.default script.
1 parent 8374f03 commit 44dfd9e

File tree

5 files changed

+81
-365
lines changed

5 files changed

+81
-365
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
unit-test:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414
concurrency:
1515
group: ${{ github.workflow }}-${{ github.ref }}
1616
cancel-in-progress: true
@@ -97,7 +97,7 @@ jobs:
9797
bash -c 'shopt -s globstar; shellcheck **/*.sh'
9898
9999
integration-test:
100-
runs-on: ubuntu-20.04
100+
runs-on: ubuntu-22.04
101101
needs: unit-test
102102
concurrency:
103103
group: ${{ github.workflow }}-${{ matrix.distro }}-${{ matrix.format }}-${{ github.ref }}

action.yaml

+15-2
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,27 @@ runs:
99
uses: actions/cache@v3
1010
with:
1111
path: build
12-
key: ${{ runner.os }}-${{ hashFiles('action/setup-github-actions.sh') }}
12+
key: ${{ runner.os }}-${{ hashFiles('action/setup-pacman.sh') }}
1313

1414
- name: Dependencies
1515
shell: bash
1616
run: |
17+
sudo apt-get update
18+
sudo apt-get install --assume-yes --no-install-recommends \
19+
debootstrap \
20+
zypper \
21+
dnf \
22+
systemd-container \
23+
qemu-system-x86 \
24+
ovmf \
25+
e2fsprogs \
26+
xfsprogs \
27+
squashfs-tools \
28+
btrfs-progs
29+
1730
mkdir -p $BUILDDIR
1831
19-
sudo -E ${{ github.action_path }}/action/setup-github-actions.sh
32+
sudo -E ${{ github.action_path }}/action/setup-pacman.sh
2033
sudo chown -R $USER: $BUILDDIR
2134
2235
sudo pacman-key --init

action/mkosi.default

+11-42
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,25 @@
11
[Distribution]
22
Distribution=ubuntu
3-
Release=focal
4-
5-
[Output]
6-
HostonlyInitrd=yes
3+
Release=jammy
74

85
[Content]
9-
Cache=../mkosi.cache/ubuntu~focal
10-
BuildScript=setup-github-actions.sh
6+
Cache=../mkosi.cache/ubuntu~jammy
7+
BuildScript=setup-pacman.sh
118
WithNetwork=yes
129
Repositories=main,universe
1310
Autologin=yes
1411
Bootable=yes
1512
Password=
16-
Packages=bzip2
17-
clang
18-
debootstrap
19-
e2fsprogs
20-
git
21-
libarchive13
22-
libcap2
23-
libcppunit-1.15-0
24-
libcurl4
25-
libdb5.3
26-
libgcrypt20
27-
libglib2.0.0
28-
libgpgme11
29-
libjson-c4
30-
liblua5.3-0
31-
liblzma5
32-
libmagic1
33-
libpopt0
34-
libpython3.8
35-
libsmartcols1
36-
libsqlite3-0
37-
libssl1.1
38-
libtool
39-
libxml2
40-
libyaml-0-2
41-
libzstd1
42-
python-is-python3
43-
python3
44-
python3-distutils
45-
python3-gpg
46-
python3-setuptools
47-
rustc
48-
squashfs-tools
13+
Packages=debootstrap
14+
zypper
15+
dnf
4916
systemd-container
17+
qemu-system-x86
18+
ovmf
19+
squashfs-tools
20+
e2fsprogs
5021
xfsprogs
51-
zlib1g
52-
zypper
53-
22+
btrfs-progs
5423

5524
[Validation]
5625
QemuHeadless=yes

0 commit comments

Comments
 (0)