From c53df275d512a219806a181de3bd57f02dc38dab Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 4 Nov 2024 20:22:01 +0000 Subject: [PATCH 1/3] test: fix tool name in comment --- src/ukify/test/test_ukify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ukify/test/test_ukify.py b/src/ukify/test/test_ukify.py index c547e7caee..70e1a4e1d0 100755 --- a/src/ukify/test/test_ukify.py +++ b/src/ukify/test/test_ukify.py @@ -623,7 +623,7 @@ def test_efi_signing_pesign(kernel_initrd, tmp_path): ukify.make_uki(opts) - # let's check that sbverify likes the resulting file + # let's check that pesign likes the resulting file dump = subprocess.check_output([ 'pesign', '-S', '-i', output, From 441922336baf4e302e3b88849c5a08c73b602044 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 4 Nov 2024 20:26:34 +0000 Subject: [PATCH 2/3] test: set nullglob to avoid failure when building without sd-boot 2024-11-04T20:13:17.3258095Z + for loader in build/src/boot/efi/*{.efi,.efi.stub} 2024-11-04T20:13:17.3258275Z ++ sbverify --list 'build/src/boot/efi/*.efi' 2024-11-04T20:13:17.3258525Z + [[ Error reading file build/src/boot/efi/*.efi: No such file or directory 2024-11-04T20:13:17.3258952Z Can't open image build/src/boot/efi/*.efi != \N\o\ \s\i\g\n\a\t\u\r\e\ \t\a\b\l\e\ \p\r\e\s\e\n\t ]] --- .github/workflows/build_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index d2123dfd6a..cc989da043 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -3,6 +3,8 @@ set -ex +shopt -s nullglob + info() { echo -e "\033[33;1m$1\033[0m"; } fatal() { echo >&2 -e "\033[31;1m$1\033[0m"; exit 1; } success() { echo >&2 -e "\033[32;1m$1\033[0m"; } From 8a3ac7afa6be8447061dc6cbd98830bb332fed28 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 4 Nov 2024 19:43:02 +0000 Subject: [PATCH 3/3] ci: add coverage for builds without sd-boot This should catch compilation issues such as: https://github.com/systemd/systemd/pull/35014 --- .github/workflows/build_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_test.sh b/.github/workflows/build_test.sh index cc989da043..113af704a8 100755 --- a/.github/workflows/build_test.sh +++ b/.github/workflows/build_test.sh @@ -14,7 +14,7 @@ ARGS=( "--optimization=s -Dutmp=false" "--optimization=2 -Dc_args=-Wmaybe-uninitialized -Ddns-over-tls=openssl" "--optimization=3 -Db_lto=true -Ddns-over-tls=false" - "--optimization=3 -Db_lto=false -Dtpm2=disabled -Dlibfido2=disabled -Dp11kit=disabled" + "--optimization=3 -Db_lto=false -Dtpm2=disabled -Dlibfido2=disabled -Dp11kit=disabled -Defi=false -Dbootloader=disabled" "--optimization=3 -Dfexecve=true -Dstandalone-binaries=true -Dstatic-libsystemd=true -Dstatic-libudev=true" "-Db_ndebug=true" )