From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 3 Dec 2024 16:11:41 +0000 (+0100)
Subject: mkosi/ci: use a bash array to pass options
X-Git-Tag: v257~36^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5292d63af833ad583bb707f21b9f336c024a1d7;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index a7dee7ee256..9e20a63179f 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