Skip to content

Commit 7ef3309

Browse files
committed
CI: undo mkosi.yml overwrite of systemd tools from main
The tools from main are no longer compatible with images built in this stable branch. Ubuntu 24.04 ships with v255 which is good enough, so restore those binaries. (cherry picked from commit 92df356) (cherry picked from commit b5823d6)
1 parent cce5535 commit 7ef3309

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.github/workflows/mkosi.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ jobs:
8484

8585
- name: Configure
8686
run: |
87+
# mkosi GHA clones and builds from main but tools are not compatible with this branch, 24.04 ships 255 which is enough
88+
sudo apt install --reinstall systemd systemd-container systemd-boot systemd-ukify
89+
8790
tee mkosi.default <<- EOF
8891
[Distribution]
8992
Distribution=${{ matrix.distro }}
@@ -124,8 +127,6 @@ jobs:
124127
CopyFiles=/
125128
Minimize=guess
126129
EOF
127-
sudo ln -svf "$(dirname "$(readlink /usr/bin/bootctl)")/systemd-keyutil" /usr/lib/systemd/systemd-keyutil
128-
/usr/lib/systemd/systemd-keyutil --version
129130
130131
- name: Generate secure boot key
131132
run: sudo mkosi genkey

0 commit comments

Comments
 (0)