Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-11-25 22:26:29 -05:00
Code Issues Projects Releases Packages Wiki Activity

ci: update mkosi to support systemd-repart

Browse source
This commit is contained in:
Malte Poll 2023-01-24 12:05:46 +01:00
parent 6d1c4e2861
commit bd37acfc84
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
.github/actions/setup_mkosi/action.yaml vendored
View file

@ -15,11 +15,13 @@ runs:
sudo apt-get update sudo apt-get update
sudo apt-get install --assume-yes --no-install-recommends \ sudo apt-get install --assume-yes --no-install-recommends \
dnf \ dnf \
systemd-container \
qemu-system-x86 \
ovmf \
e2fsprogs \ e2fsprogs \
squashfs-tools libfdisk-dev \
mtools \
ovmf \
qemu-system-x86 \
squashfs-tools \
systemd-container
echo "::endgroup::" echo "::endgroup::"
# Try to eliminate "Failed to dissect image: Connection timed out" errors from nspawn by compiling # Try to eliminate "Failed to dissect image: Connection timed out" errors from nspawn by compiling
@ -30,11 +32,19 @@ runs:
run: | run: |
echo "::group::Update systemd-nspawn" echo "::group::Update systemd-nspawn"
sudo apt-get build-dep systemd sudo apt-get build-dep systemd
git clone https://github.com/systemd/systemd-stable --branch v251.2 --depth=1 git clone https://github.com/systemd/systemd --depth=1
meson systemd-stable/build systemd-stable meson systemd/build systemd -Drepart=true -Defi=true
ninja -C systemd-stable/build systemd-nspawn ninja -C systemd/build systemd-nspawn systemd-dissect systemd-repart systemd-analyze bootctl ukify
sudo ln -svf $PWD/systemd-stable/build/systemd-nspawn $(which systemd-nspawn) sudo ln -svf $PWD/systemd/build/systemd-nspawn /usr/bin/systemd-nspawn
sudo ln -svf $PWD/systemd/build/systemd-dissect /usr/bin/systemd-dissect
sudo ln -svf $PWD/systemd/build/systemd-repart /usr/bin/systemd-repart
sudo ln -svf $PWD/systemd/build/systemd-analyze /usr/bin/systemd-analyze
sudo ln -svf $PWD/systemd/build/bootctl /usr/bin/bootctl
sudo ln -svf $PWD/systemd/build/ukify /usr/bin/ukify
systemd-nspawn --version systemd-nspawn --version
systemd-dissect --version
systemd-repart --version
bootctl --version
echo "::endgroup::" echo "::endgroup::"
- name: Install - name: Install

2
.github/workflows/build-os-image.yml vendored
View file

@ -274,7 +274,7 @@ jobs:
- name: Setup mkosi - name: Setup mkosi
uses: ./.github/actions/setup_mkosi uses: ./.github/actions/setup_mkosi
with: with:
version: 058046019e7ed2e8e93af87b8c14a808dcc6bbc3 version: b93e87a9dbbe30a79a42dfff9682a590f1052f53
- name: Prepare PKI for secure boot signing - name: Prepare PKI for secure boot signing
id: prepare-pki id: prepare-pki