diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-01-10 12:04:10 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-01-15 20:44:53 +0100 |
| commit | 9d2e4ceee5bf891354754775fd98c6792e672af8 (patch) | |
| tree | 69efe3a4d984c42cd1e08c8c58f5f327a3efdd6c | |
| parent | 3d16448758b9ea9e0f451b299f9991a30bacbdf5 (diff) | |
| download | systemd-9d2e4ceee5bf891354754775fd98c6792e672af8.tar.gz | |
ci: Update mkosi action to latest commit
Let's make sure we're testing with the latest changes in mkosi. This
includes both the switch to systemd-repart and ukify, making sure we
get extra testing coverage for those components.
This also drops options from the centos config that have been removed
in the newer mkosi.
For some reason idmapping runs into some issues so we disable it for
now.
| -rw-r--r-- | .github/workflows/mkosi.yml | 18 | ||||
| -rw-r--r-- | mkosi.conf.d/centos/10-mkosi.centos (renamed from mkosi.conf.d/centos_epel/10-mkosi.centos_epel) | 7 |
2 files changed, 6 insertions, 19 deletions
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 0e3cfae7b8..357b4f4205 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -72,24 +72,14 @@ jobs: release: rawhide - distro: opensuse release: tumbleweed - - distro: centos_epel + - distro: centos release: 9-stream - - distro: centos_epel + - distro: centos release: 8-stream steps: - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b - - uses: systemd/mkosi@c9772ec920f1cd03181ba14e6fe2c3d35ccb4f92 - - # FIXME: temporary workaround for a file conflict between systemd (C9S) and - # systemd-boot (EPEL9). Drop this once systemd in C9S is updated to v252 - # (should be done by the end of 2022). - - name: Fix C9S/EPEL9 - if: ${{ matrix.release == '9-stream' }} - run: sudo sed -i '/add_packages/s/systemd-boot/systemd/g' /usr/local/lib/python3.10/dist-packages/mkosi/__init__.py - - - name: Install - run: sudo apt-get update && sudo apt-get install --no-install-recommends python3-pexpect python3-jinja2 + - uses: systemd/mkosi@ab2aff830096e681da1950a7d29f277caa89516c - name: Configure run: | @@ -106,7 +96,7 @@ jobs: EOF - name: Build ${{ matrix.distro }} - run: sudo mkosi build + run: sudo mkosi --idmap no - name: Show ${{ matrix.distro }} image summary run: sudo mkosi summary diff --git a/mkosi.conf.d/centos_epel/10-mkosi.centos_epel b/mkosi.conf.d/centos/10-mkosi.centos index 768403f7cf..a950cbd4d2 100644 --- a/mkosi.conf.d/centos_epel/10-mkosi.centos_epel +++ b/mkosi.conf.d/centos/10-mkosi.centos @@ -4,11 +4,8 @@ # Symlink this file to mkosi.default in the project root directory and invoke "mkosi" to build an OS image. [Distribution] -Distribution=centos_epel - -[Output] -Format=gpt_xfs -HostonlyInitrd=no +Distribution=centos +Repositories=epel [Content] Packages= |