diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-09-17 10:57:39 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2021-09-21 17:39:00 +0100 |
| commit | 7e99216c1dde13097ffda370064dd29d4dfd87cb (patch) | |
| tree | ff080020da88d6be28f5bee15a30251e8c4dac9a /.github | |
| parent | 71a80dcc0b64b01c73e7141c4292ef301543a011 (diff) | |
| download | systemd-7e99216c1dde13097ffda370064dd29d4dfd87cb.tar.gz | |
mkosi: Fix CI
\#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.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/mkosi.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 75aa948aa9..6c60154360 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -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 |