actions/mkosi@main 2

vt-alt · Aug 6, 2024 · a2eec05 · a2eec05
1 parent 69f48b8
commit a2eec05
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/.github/workflows/mkosi-boot.yml b/.github/workflows/mkosi-boot.yml
@@ -16,17 +16,13 @@ jobs:
             - uses: actions/checkout@v3
             - run: sudo apt-get update
             - run: sudo apt-get install -y debootstrap qemu-system-x86 systemd-container expect
-            - name: Install mkosi from git
-              # Native focal package seems to be too old (v5) and not even
-              # able to build images properly.
+            - uses: systemd/mkosi@main
+            - name: Check mkosi
               run: |
-                  sudo python3 -m pip install git+https://github.com/systemd/mkosi.git@v14
-                  sudo sed -i 's/linux-generic/linux-virtual/' /usr/local/lib/python*/dist-packages/mkosi/__init__.py
-                  sudo rm -f /dev/kvm
-                  echo /usr/local/bin >> $GITHUB_PATH
+                  mkosi --version
 
             - name: Create bootable image using mkosi
-              run: sudo mkosi -r ${{ matrix.release }} --cache=mkosi.cache
+              run: mkosi -r ${{ matrix.release }} --cache=mkosi.cache
 
             - name: Boot image on qemu
               run: |

diff --git a/.github/workflows/mkosi-mainline.yml b/.github/workflows/mkosi-mainline.yml
@@ -14,13 +14,11 @@ jobs:
         steps:
             - uses: actions/checkout@v3
             - run: sudo apt-get update
-            - run: sudo apt-get install -y mkosi
             - run: sudo apt-get install -y debootstrap qemu-system-x86 systemd-container expect sysvbanner
-            - name: Install mkosi from git
-              # Native focal package seems to be too old (v5) and not even
-              # able to build images properly.
+            - uses: systemd/mkosi@main
+            - name: Check mkosi
               run: |
-                  sudo rm -f /dev/kvm
+                  mkosi --version
 
             - name: Install debootstrap from Ubuntu git
               run: |
@@ -37,7 +35,7 @@ jobs:
                   git diff
 
             - name: Create bootable image using mkosi
-              run: sudo mkosi -r ${{ env.series }} --cache=mkosi.cache --prepare-script=.github/workflows/dpkg-i.sh
+              run: mkosi -r ${{ env.series }} --cache=mkosi.cache --prepare-script=.github/workflows/dpkg-i.sh
 
             - name: Boot image on qemu
               run: |