From 3757c8545666af38ae29cc946e3da06ef9a8baae Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 19 Mar 2026 14:50:12 -0400 Subject: [PATCH 1/5] CI: Update from f39/f40/f41 to f42/f43/f44 Fedora 41 is pretty old, so update to some supported (or nearly supported) OSes. Signed-off-by: Peter Jones --- .github/workflows/pullrequest.yml | 53 +++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 679ecbd66..eb385b5ae 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -22,57 +22,62 @@ jobs: efiarch: aa64 gccarch: aarch64 makearch: aarch64 - distro: f41 + distro: f45 - arch: amd64 efiarch: aa64 gccarch: aarch64 makearch: aarch64 - distro: f40 + distro: f44 + - arch: amd64 + efiarch: aa64 + gccarch: aarch64 + makearch: aarch64 + distro: f43 - arch: amd64 efiarch: arm gccarch: arm makearch: arm - distro: f41 + distro: f45 - arch: amd64 efiarch: arm gccarch: arm makearch: arm - distro: f40 + distro: f44 - arch: amd64 efiarch: arm gccarch: arm makearch: arm - distro: f39 + distro: f43 - arch: amd64 efiarch: x64 gccarch: x86_64 makearch: x86_64 - distro: f41 + distro: f45 - arch: amd64 efiarch: x64 gccarch: x86_64 makearch: x86_64 - distro: f40 + distro: f44 - arch: amd64 efiarch: x64 gccarch: x86_64 makearch: x86_64 - distro: f39 + distro: f43 - arch: amd64 efiarch: ia32 gccarch: x86_64 makearch: ia32 - distro: f41 + distro: f45 - arch: amd64 efiarch: ia32 gccarch: x86_64 makearch: ia32 - distro: f40 + distro: f44 - arch: amd64 efiarch: ia32 gccarch: x86_64 makearch: ia32 - distro: f39 + distro: f43 steps: - name: Checkout @@ -122,15 +127,15 @@ jobs: - arch: amd64 efiarch: x64 makearch: x86_64 - distro: f41 + distro: f45 - arch: amd64 efiarch: x64 makearch: x86_64 - distro: f40 + distro: f44 - arch: amd64 efiarch: x64 makearch: x86_64 - distro: f39 + distro: f43 - arch: amd64 efiarch: x64 makearch: x86_64 @@ -142,7 +147,15 @@ jobs: - arch: amd64 efiarch: ia32 makearch: ia32 - distro: f39 + distro: f45 + - arch: amd64 + efiarch: ia32 + makearch: ia32 + distro: f44 + - arch: amd64 + efiarch: ia32 + makearch: ia32 + distro: f43 - arch: amd64 efiarch: ia32 makearch: ia32 @@ -194,7 +207,15 @@ jobs: - arch: amd64 efiarch: x64 makearch: x86_64 - distro: f41 + distro: f45 + - arch: amd64 + efiarch: x64 + makearch: x86_64 + distro: f44 + - arch: amd64 + efiarch: x64 + makearch: x86_64 + distro: f43 steps: - name: Checkout From b42e357eb8cc46db8527dc2b7a4642ba94c030a7 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 19 Mar 2026 14:51:22 -0400 Subject: [PATCH 2/5] CI: Add centos10 This adds centos10 to CI. Signed-off-by: Peter Jones --- .github/workflows/pullrequest.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index eb385b5ae..072460965 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -136,6 +136,10 @@ jobs: efiarch: x64 makearch: x86_64 distro: f43 + - arch: amd64 + efiarch: x64 + makearch: x86_64 + distro: centos10 - arch: amd64 efiarch: x64 makearch: x86_64 From 43a8b64d126c851aa6956930fccf4131f63265fa Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 19 Mar 2026 17:24:41 -0400 Subject: [PATCH 3/5] test: fix strrchr usage. Apparently strrchr() became a macro in glibc recently, breaking our test case that tries to #define it. This patch undefines it before we try to define it. Signed-off-by: Peter Jones --- lib/string.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/string.c b/lib/string.c index d941cd566..62c862b8e 100644 --- a/lib/string.c +++ b/lib/string.c @@ -17,6 +17,9 @@ #define strncmp shim_strncmp #define strncasecmp shim_strncasecmp #define strcasecmp shim_strcasecmp +#ifdef strrchr +#undef strrchr +#endif #define strrchr shim_strrchr #define strlen shim_strlen #define strnlen shim_strnlen From 954af242e08ecd49f140ea9e6a1f97c6c62ab245 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 19 Mar 2026 17:15:42 -0400 Subject: [PATCH 4/5] CI: Set fast-fail to false on all of our PR jobs Without this when e.g. f44 fails we don't necessarily know if f43 or f45 worked. Signed-off-by: Peter Jones --- .github/workflows/pullrequest.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 072460965..aca45b155 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -122,6 +122,7 @@ jobs: name: ${{ matrix.distro }} ${{ matrix.efiarch }} build strategy: + fail-fast: false matrix: include: - arch: amd64 @@ -206,6 +207,7 @@ jobs: name: ${{ matrix.distro }} ${{ matrix.efiarch }} build compile_commands.json strategy: + fail-fast: false matrix: include: - arch: amd64 From f3cbb0843c5226b76c2419e2ae58693d97568a5e Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 19 Mar 2026 17:13:07 -0400 Subject: [PATCH 5/5] CI: Try to fix the node.js version workflow warnings... Signed-off-by: Peter Jones --- .github/workflows/mkosi.yml | 2 +- .github/workflows/pullrequest.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 9db494850..aac64c520 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -67,7 +67,7 @@ jobs: runner: ubuntu-24.04-arm steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - uses: actions/checkout@v5 with: submodules: recursive - uses: systemd/mkosi@main diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index aca45b155..d74b6ea6e 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -81,7 +81,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: # otherwise we are testing target branch instead of the PR branch (see pull_request_target trigger) ref: ${{ github.event.pull_request.head.sha }} @@ -168,7 +168,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: # otherwise we are testing target branch instead of the PR branch (see pull_request_target trigger) ref: ${{ github.event.pull_request.head.sha }} @@ -225,7 +225,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: # otherwise we are testing target branch instead of the PR branch (see pull_request_target trigger) ref: ${{ github.event.pull_request.head.sha }}