diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-12-03 17:11:41 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2024-12-04 09:57:34 +0100 |
| commit | f5292d63af833ad583bb707f21b9f336c024a1d7 (patch) | |
| tree | c44c7cf0442eb5f5bd29addcd6b1f2dc658e7fae /.github | |
| parent | pid1: assume user namespaces are unavailable if we get -EINVAL from clone (#3... (diff) | |
| download | systemd-f5292d63af833ad583bb707f21b9f336c024a1d7.tar.xz systemd-f5292d63af833ad583bb707f21b9f336c024a1d7.zip | |
mkosi/ci: use a bash array to pass options
This patch initially also changed the configuration, but that'll be done in a
different way, so all that remains is the syntax change.
An array is nicer because the array definition can have inline comments and
doesn't use continuation symbols which are easy to mess up in edits.
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 |