try-pipx

Signed-off-by: Vitaly Chikunov <[email protected]>
vt-alt · Aug 6, 2024 · 8d11b53 · 8d11b53
1 parent 40794c8
commit 8d11b53
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/mkosi-boot.yml b/.github/workflows/mkosi-boot.yml
@@ -15,14 +15,15 @@ jobs:
         steps:
             - uses: actions/checkout@v3
             - run: sudo apt-get update
-            - run: sudo apt-get install -y debootstrap qemu-system-x86 systemd-container expect
+            - run: sudo apt-get install -y debootstrap qemu-system-x86 systemd-container expect pipx
             - name: Install mkosi from git
               # Native focal package seems to be too old (v5) and not even
               # able to build images properly.
               run: |
-                  sudo python3 -m pip install git+https://github.com/systemd/mkosi.git
+                  pipx install git+https://github.com/systemd/mkosi.git
                   sudo rm -f /dev/kvm
-                  echo /usr/local/bin >> $GITHUB_PATH
+                  echo ==$PATH==
+                  echo $HOME/.local/bin >> $GITHUB_PATH
 
             - name: Create bootable image using mkosi
               run: sudo mkosi -r ${{ matrix.release }} --cache=mkosi.cache

diff --git a/.github/workflows/mkosi-mainline.yml b/.github/workflows/mkosi-mainline.yml
@@ -14,14 +14,15 @@ jobs:
         steps:
             - uses: actions/checkout@v3
             - run: sudo apt-get update
-            - run: sudo apt-get install -y debootstrap qemu-system-x86 systemd-container expect sysvbanner
+            - run: sudo apt-get install -y debootstrap qemu-system-x86 systemd-container expect sysvbanner pipx
             - name: Install mkosi from git
               # Native focal package seems to be too old (v5) and not even
               # able to build images properly.
               run: |
-                  sudo python3 -m pip install git+https://github.com/systemd/mkosi.git
+                  pipx install git+https://github.com/systemd/mkosi.git
                   sudo rm -f /dev/kvm
-                  echo /usr/local/bin >> $GITHUB_PATH
+                  echo ==$PATH==
+                  echo $HOME/.local/bin >> $GITHUB_PATH
 
             - name: Install debootstrap from Ubuntu git
               run: |