system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-06 16:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

mkosi: Fix CI

Browse source 
\#20629 moved the mkosi configs to mkosi.default.d/ so we were building
for the host distro (Ubuntu) in each CI configuration. To fix it, we
write the distro we want to test to a mkosi.default file and mkosi
will apply the other necessary configs automatically from mkosi.default.d/<distro>

This commit also removes unnecessary CLI options that are already handled
by the config files.
This commit is contained in:
Daan De Meyer 2021-09-17 10:57:39 +01:00 committed by Luca Boccassi
parent 71a80dcc0b
commit 7e99216c1d
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/mkosi.yml vendored
View file

@ -30,8 +30,8 @@ jobs:
- name: Install
run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect python3-jinja2
- name: Symlink
run: ln -s .mkosi/mkosi.${{ matrix.distro }} mkosi.default
- name: Configure
run: echo -e "[Distribution]\nDistribution=${{ matrix.distro }}\n" > mkosi.default
# Ubuntu's systemd-nspawn doesn't support faccessat2() syscall, which is
# required, since current Arch's glibc implements faccessat() via faccessat2().
@ -47,13 +47,13 @@ jobs:
systemd-nspawn --version
- name: Build ${{ matrix.distro }}
run: sudo python3 -m mkosi --password= --network-veth=no --qemu-headless build
run: sudo python3 -m mkosi build
- name: Show ${{ matrix.distro }} image summary
run: sudo python3 -m mkosi --password= --qemu-headless summary
run: sudo python3 -m mkosi summary
- name: Boot ${{ matrix.distro }} systemd-nspawn
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --network-veth=no --qemu-headless boot
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi boot
- name: Boot ${{ matrix.distro }} QEMU
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi --password= --network-veth=no --qemu-headless qemu
run: sudo ./.github/workflows/test_mkosi_boot.py python3 -m mkosi qemu