From 438d343bdaafceffa5d9e7844dd67d34324bf317 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 21 Jul 2026 10:35:57 -0400 Subject: [PATCH 1/2] mkosi: don't require a minimum mkosi version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we have this in our mkosi configs: [Config] MinimumVersion=commit:dec7c3e754810ae6d2382d0b5e4762d7250b0254 The theory is this ensures we have a new enough mkosi for all the features / configs we're using to actually work. In practice this is always true, so what this config option does is break things when I try to duplicate results on a distro-packaged mkosi (i.e. not a git checkout done by the github systemd/mkosi@main action), with this not at all cryptic error message: $ mkosi sandbox -- mkosi --distribution fedora --kernel-command-line-extra=systemd.unit=mkosi-test.service qemu ‣ Cannot check mkosi git version, not running mkosi from a git repository So this patch comments it out. I'd remove it entirely, but it's useful to see which version things were intended for. Signed-off-by: Peter Jones --- mkosi/mkosi.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkosi/mkosi.conf b/mkosi/mkosi.conf index 496efbb02..3ecb898a8 100644 --- a/mkosi/mkosi.conf +++ b/mkosi/mkosi.conf @@ -1,5 +1,5 @@ -[Config] -MinimumVersion=commit:dec7c3e754810ae6d2382d0b5e4762d7250b0254 +#[Config] +#MinimumVersion=commit:dec7c3e754810ae6d2382d0b5e4762d7250b0254 [Output] RepartDirectories=mkosi.repart From 74d3ac8cf1ea7efe83b50591a94ad29d30cde734 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 21 Jul 2026 10:53:40 -0400 Subject: [PATCH 2/2] XXX: temporary - disable a lot of CI I just want to run the failing jobs... Signed-off-by: Peter Jones --- .github/workflows/mkosi.yml | 32 +- .github/workflows/pullrequest.yml | 528 +++++++++++++++--------------- 2 files changed, 280 insertions(+), 280 deletions(-) diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index aac64c520..ca2783dda 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -19,32 +19,32 @@ jobs: matrix: distro: - fedora - - centos - - ubuntu - - debian + #- centos + #- ubuntu + #- debian bootloader: # Locally signed systemd-boot - - systemd-boot + #- systemd-boot # Distro signed grub2 - grub-signed uki: # BLS #1 boot, kernel + initrd - - none + #- none # BLS #2 boot, locally built UKI (unsigned because it is not provided by the distro) - unsigned runner: - ubuntu-24.04 - - ubuntu-24.04-arm - include: - # Debian provides distro-signed systemd-boot - - distro: debian - bootloader: systemd-boot-signed - uki: unsigned - runner: ubuntu-24.04 - - distro: debian - bootloader: systemd-boot-signed - uki: unsigned - runner: ubuntu-24.04-arm + #- ubuntu-24.04-arm + #include: + # Debian provides distro-signed systemd-boot + # - distro: debian + # bootloader: systemd-boot-signed + # uki: unsigned + # runner: ubuntu-24.04 + # - distro: debian + # bootloader: systemd-boot-signed + # uki: unsigned + # runner: ubuntu-24.04-arm exclude: # The systemd-boot version in 24.04 fails to boot the arm64 compressed kernel - distro: ubuntu diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 693d0baa3..c972ecd36 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -1,264 +1,264 @@ -name: pull-request - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - cross-build-pull-request: - runs-on: ubuntu-24.04 - container: vathpela/efi-ci:${{ matrix.distro }}-x64 - name: ${{ matrix.distro }} ${{ matrix.efiarch }} cross-build - - strategy: - fail-fast: false - matrix: - include: - - arch: amd64 - efiarch: aa64 - gccarch: aarch64 - makearch: aarch64 - distro: f45 - - arch: amd64 - efiarch: aa64 - gccarch: aarch64 - makearch: aarch64 - distro: f44 - - arch: amd64 - efiarch: aa64 - gccarch: aarch64 - makearch: aarch64 - distro: f43 - - arch: amd64 - efiarch: arm - gccarch: arm - makearch: arm - distro: f45 - - arch: amd64 - efiarch: arm - gccarch: arm - makearch: arm - distro: f44 - - arch: amd64 - efiarch: arm - gccarch: arm - makearch: arm - distro: f43 - - arch: amd64 - efiarch: x64 - gccarch: x86_64 - makearch: x86_64 - distro: f45 - - arch: amd64 - efiarch: x64 - gccarch: x86_64 - makearch: x86_64 - distro: f44 - - arch: amd64 - efiarch: x64 - gccarch: x86_64 - makearch: x86_64 - distro: f43 - - arch: amd64 - efiarch: ia32 - gccarch: x86_64 - makearch: ia32 - distro: f45 - - arch: amd64 - efiarch: ia32 - gccarch: x86_64 - makearch: ia32 - distro: f44 - - arch: amd64 - efiarch: ia32 - gccarch: x86_64 - makearch: ia32 - distro: f43 - - arch: amd64 - efiarch: riscv64 - gccarch: riscv64 - makearch: riscv64 - distro: f45 - - arch: amd64 - efiarch: riscv64 - gccarch: riscv64 - makearch: riscv64 - distro: f44 - - arch: amd64 - efiarch: riscv64 - gccarch: riscv64 - makearch: riscv64 - distro: f43 - - steps: - - name: Checkout - 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 }} - fetch-depth: 0 - submodules: recursive - - name: Work around directory ownership issue - id: ignore-ownership - run: | - git config --global --add safe.directory /__w/shim/shim - - name: Update submodules on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: update-submodules - run: | - make update - - name: Make a build directory for ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: builddir - run: | - rm -rf build-${{ matrix.distro }}-${{ matrix.efiarch }} - mkdir build-${{ matrix.distro }}-${{ matrix.efiarch }} - cd build-${{ matrix.distro }}-${{ matrix.efiarch }} - - name: Do the build on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: build - run: | - pwd - cd build-${{ matrix.distro }}-${{ matrix.efiarch }} - make TOPDIR=.. -f ../Makefile CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all - - name: Install on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: install - run: | - pwd - cd build-${{ matrix.distro }}-${{ matrix.efiarch }} - make TOPDIR=.. -f ../Makefile CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install - echo 'results:' - find /destdir -type f - - build-pull-request-intel: - runs-on: ubuntu-24.04 - container: vathpela/efi-ci:${{ matrix.distro }}-x64 - name: ${{ matrix.distro }} ${{ matrix.efiarch }} build - - strategy: - fail-fast: false - matrix: - include: - - arch: amd64 - efiarch: x64 - makearch: x86_64 - distro: f45 - - arch: amd64 - efiarch: x64 - makearch: x86_64 - distro: f44 - - arch: amd64 - efiarch: x64 - makearch: x86_64 - distro: f43 - - arch: amd64 - efiarch: x64 - makearch: x86_64 - distro: centos10 - - arch: amd64 - efiarch: x64 - makearch: x86_64 - distro: centos9 - - arch: amd64 - efiarch: x64 - makearch: x86_64 - distro: centos8 - - arch: amd64 - efiarch: ia32 - makearch: ia32 - distro: f45 - - arch: amd64 - efiarch: ia32 - makearch: ia32 - distro: f44 - - arch: amd64 - efiarch: ia32 - makearch: ia32 - distro: f43 - - arch: amd64 - efiarch: ia32 - makearch: ia32 - distro: centos8 - - steps: - - name: Checkout - 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 }} - fetch-depth: 0 - submodules: recursive - - name: Work around directory ownership issue - id: ignore-ownership - run: | - git config --global --add safe.directory /__w/shim/shim - - name: Update submodules on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: update-submodules - run: | - make update - - name: Do 'make clean' on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: clean - run: | - make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean - - name: Run tests on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: test - run: | - make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test - - name: Do the build on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: build - run: | - make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all - - name: Install on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: install - run: | - make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install - echo 'results:' - find /destdir -type f - - build-pull-request-intel-compile-commands-json: - runs-on: ubuntu-24.04 - container: vathpela/efi-ci:${{ matrix.distro }}-x64 - name: ${{ matrix.distro }} ${{ matrix.efiarch }} build compile_commands.json - - strategy: - fail-fast: false - matrix: - include: - - arch: amd64 - efiarch: x64 - makearch: x86_64 - distro: f45 - - arch: amd64 - efiarch: x64 - makearch: x86_64 - distro: f44 - - arch: amd64 - efiarch: x64 - makearch: x86_64 - distro: f43 - - steps: - - name: Checkout - 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 }} - fetch-depth: 0 - submodules: recursive - - name: Work around directory ownership issue - id: ignore-ownership - run: | - git config --global --add safe.directory /__w/shim/shim - - name: Update submodules on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: update-submodules - run: | - make update - - name: Do 'make clean' on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: clean - run: | - make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean - - name: Build compile_commands.json on ${{ matrix.distro }} for ${{ matrix.efiarch }} - id: compile_commands - run: | - make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true compile_commands.json +#name: pull-request +# +#on: +# push: +# branches: +# - main +# pull_request: +# branches: +# - main +# +#jobs: +# cross-build-pull-request: +# runs-on: ubuntu-24.04 +# container: vathpela/efi-ci:${{ matrix.distro }}-x64 +# name: ${{ matrix.distro }} ${{ matrix.efiarch }} cross-build +# +# strategy: +# fail-fast: false +# matrix: +# include: +# - arch: amd64 +# efiarch: aa64 +# gccarch: aarch64 +# makearch: aarch64 +# distro: f45 +# - arch: amd64 +# efiarch: aa64 +# gccarch: aarch64 +# makearch: aarch64 +# distro: f44 +# - arch: amd64 +# efiarch: aa64 +# gccarch: aarch64 +# makearch: aarch64 +# distro: f43 +# - arch: amd64 +# efiarch: arm +# gccarch: arm +# makearch: arm +# distro: f45 +# - arch: amd64 +# efiarch: arm +# gccarch: arm +# makearch: arm +# distro: f44 +# - arch: amd64 +# efiarch: arm +# gccarch: arm +# makearch: arm +# distro: f43 +# - arch: amd64 +# efiarch: x64 +# gccarch: x86_64 +# makearch: x86_64 +# distro: f45 +# - arch: amd64 +# efiarch: x64 +# gccarch: x86_64 +# makearch: x86_64 +# distro: f44 +# - arch: amd64 +# efiarch: x64 +# gccarch: x86_64 +# makearch: x86_64 +# distro: f43 +# - arch: amd64 +# efiarch: ia32 +# gccarch: x86_64 +# makearch: ia32 +# distro: f45 +# - arch: amd64 +# efiarch: ia32 +# gccarch: x86_64 +# makearch: ia32 +# distro: f44 +# - arch: amd64 +# efiarch: ia32 +# gccarch: x86_64 +# makearch: ia32 +# distro: f43 +# - arch: amd64 +# efiarch: riscv64 +# gccarch: riscv64 +# makearch: riscv64 +# distro: f45 +# - arch: amd64 +# efiarch: riscv64 +# gccarch: riscv64 +# makearch: riscv64 +# distro: f44 +# - arch: amd64 +# efiarch: riscv64 +# gccarch: riscv64 +# makearch: riscv64 +# distro: f43 +# +# steps: +# - name: Checkout +# 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 }} +# fetch-depth: 0 +# submodules: recursive +# - name: Work around directory ownership issue +# id: ignore-ownership +# run: | +# git config --global --add safe.directory /__w/shim/shim +# - name: Update submodules on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: update-submodules +# run: | +# make update +# - name: Make a build directory for ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: builddir +# run: | +# rm -rf build-${{ matrix.distro }}-${{ matrix.efiarch }} +# mkdir build-${{ matrix.distro }}-${{ matrix.efiarch }} +# cd build-${{ matrix.distro }}-${{ matrix.efiarch }} +# - name: Do the build on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: build +# run: | +# pwd +# cd build-${{ matrix.distro }}-${{ matrix.efiarch }} +# make TOPDIR=.. -f ../Makefile CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all +# - name: Install on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: install +# run: | +# pwd +# cd build-${{ matrix.distro }}-${{ matrix.efiarch }} +# make TOPDIR=.. -f ../Makefile CROSS_COMPILE=${{ matrix.gccarch }}-linux-gnu- ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install +# echo 'results:' +# find /destdir -type f +# +# build-pull-request-intel: +# runs-on: ubuntu-24.04 +# container: vathpela/efi-ci:${{ matrix.distro }}-x64 +# name: ${{ matrix.distro }} ${{ matrix.efiarch }} build +# +# strategy: +# fail-fast: false +# matrix: +# include: +# - arch: amd64 +# efiarch: x64 +# makearch: x86_64 +# distro: f45 +# - arch: amd64 +# efiarch: x64 +# makearch: x86_64 +# distro: f44 +# - arch: amd64 +# efiarch: x64 +# makearch: x86_64 +# distro: f43 +# - arch: amd64 +# efiarch: x64 +# makearch: x86_64 +# distro: centos10 +# - arch: amd64 +# efiarch: x64 +# makearch: x86_64 +# distro: centos9 +# - arch: amd64 +# efiarch: x64 +# makearch: x86_64 +# distro: centos8 +# - arch: amd64 +# efiarch: ia32 +# makearch: ia32 +# distro: f45 +# - arch: amd64 +# efiarch: ia32 +# makearch: ia32 +# distro: f44 +# - arch: amd64 +# efiarch: ia32 +# makearch: ia32 +# distro: f43 +# - arch: amd64 +# efiarch: ia32 +# makearch: ia32 +# distro: centos8 +# +# steps: +# - name: Checkout +# 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 }} +# fetch-depth: 0 +# submodules: recursive +# - name: Work around directory ownership issue +# id: ignore-ownership +# run: | +# git config --global --add safe.directory /__w/shim/shim +# - name: Update submodules on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: update-submodules +# run: | +# make update +# - name: Do 'make clean' on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: clean +# run: | +# make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean +# - name: Run tests on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: test +# run: | +# make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true test +# - name: Do the build on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: build +# run: | +# make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true all +# - name: Install on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: install +# run: | +# make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true install +# echo 'results:' +# find /destdir -type f +# +# build-pull-request-intel-compile-commands-json: +# runs-on: ubuntu-24.04 +# container: vathpela/efi-ci:${{ matrix.distro }}-x64 +# name: ${{ matrix.distro }} ${{ matrix.efiarch }} build compile_commands.json +# +# strategy: +# fail-fast: false +# matrix: +# include: +# - arch: amd64 +# efiarch: x64 +# makearch: x86_64 +# distro: f45 +# - arch: amd64 +# efiarch: x64 +# makearch: x86_64 +# distro: f44 +# - arch: amd64 +# efiarch: x64 +# makearch: x86_64 +# distro: f43 +# +# steps: +# - name: Checkout +# 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 }} +# fetch-depth: 0 +# submodules: recursive +# - name: Work around directory ownership issue +# id: ignore-ownership +# run: | +# git config --global --add safe.directory /__w/shim/shim +# - name: Update submodules on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: update-submodules +# run: | +# make update +# - name: Do 'make clean' on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: clean +# run: | +# make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true clean +# - name: Build compile_commands.json on ${{ matrix.distro }} for ${{ matrix.efiarch }} +# id: compile_commands +# run: | +# make ARCH=${{ matrix.makearch }} PREFIX=/usr DESTDIR=/destdir EFIDIR=test ENABLE_SHIM_HASH=true compile_commands.json