diff options
| author | Luca Boccassi <bluca@debian.org> | 2024-12-04 14:32:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-04 14:32:28 +0100 |
| commit | 162760f16cd1f9c512eb3dde0d47a15b950325a4 (patch) | |
| tree | 092b8740d00594a068aed87548a2578f75bd2bce /.github | |
| parent | mkosi: disable Fedora specific drop-in config when running with sanitizers (#... (diff) | |
| parent | TEST-64: use more idiomatic loop syntax (diff) | |
| download | systemd-162760f16cd1f9c512eb3dde0d47a15b950325a4.tar.xz systemd-162760f16cd1f9c512eb3dde0d47a15b950325a4.zip | |
Use nicer syntax in two places in CI (#35455)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/mkosi.yml | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index a7dee7ee25..9e20a63179 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -132,6 +132,7 @@ jobs: run: | # XXX: drop after the HyperV bug that breaks secure boot KVM guests is solved sed -i "s/'firmware'\s*:\s*'auto'/'firmware' : 'uefi'/g" test/*/meson.build + tee mkosi.local.conf <<EOF [Distribution] Distribution=${{ matrix.distro }} @@ -186,21 +187,24 @@ jobs: - name: Configure meson run: | - meson setup build \ - --buildtype=debugoptimized \ - -Dintegration-tests=true \ - -Dremote=enabled \ - -Dopenssl=enabled \ - -Dblkid=enabled \ - -Dtpm2=enabled \ - -Dlibcryptsetup=enabled \ - -Dlibcurl=enabled \ - -Drepart=enabled \ - -Dfirstboot=true \ - -Dsysusers=true \ - -Dtmpfiles=true \ - -Dhwdb=true \ + OPTIONS=( + --buildtype=debugoptimized + -Dintegration-tests=true + -Dremote=enabled + -Dopenssl=enabled + -Dblkid=enabled + -Dtpm2=enabled + -Dlibcryptsetup=enabled + -Dlibcurl=enabled + -Drepart=enabled + -Dfirstboot=true + -Dsysusers=true + -Dtmpfiles=true + -Dhwdb=true -Dvmspawn=enabled + ) + + meson setup build "${OPTIONS[@]}" - name: Build image run: sudo meson compile -C build mkosi |