]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkosi/ci: use a bash array to pass options
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 3 Dec 2024 16:11:41 +0000 (17:11 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 4 Dec 2024 08:57:34 +0000 (09:57 +0100)
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.

.github/workflows/mkosi.yml

index a7dee7ee256e2068cede2c2d558d193f07250bce..9e20a63179f563be8e973415a8cb486b176f8074 100644 (file)
@@ -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