🔶 mommy uses vm actions again for netbsd~

FWDekker · Apr 28, 2024 · 2e68f83 · 2e68f83
1 parent 41458be
commit 2e68f83
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -145,12 +145,11 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Install fpm && Build package
-        uses: cross-platform-actions/action@v0.24.0
+      - name: Build package
+        uses: vmactions/openbsd-vm@v1
         with:
-          operating_system: netbsd
-          version: "10.0"
-          run: |
+          usesh: true
+          prepare: |
             set -e
             export PATH="/usr/sbin:$PATH"  # Add 'pkg_*' commands to path
 
@@ -162,6 +161,10 @@ jobs:
             git config --global --add safe.directory "$GITHUB_WORKSPACE"
             echo "::endgroup::"
 
+          run: |
+            set -e
+            export PATH="/usr/sbin:$PATH"  # Add 'pkg_*' commands to path
+
             echo "::group::Build package"
             gmake dist/netbsd
             echo "::endgroup::"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -434,14 +434,12 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Test script and package
-        uses: cross-platform-actions/action@v0.24.0
+        uses: vmactions/openbsd-vm@v1
         with:
-          operating_system: netbsd
-          version: "10.0"
-          run: |
+          usesh: true
+          prepare: |
             set -e
             export PATH="/usr/sbin:$PATH"  # Add 'pkg_*' commands to path
-            export MOMMY_ZSH_SKIP=1  # zsh completion capturing totally does not work~
 
             echo "::group::Install basic packages"
             sudo pkgin -y in git gmake mozilla-rootcerts-openssl
@@ -462,6 +460,11 @@ jobs:
             git config --global --add safe.directory "$GITHUB_WORKSPACE"
             echo "::endgroup::"
 
+          run: |
+            set -e
+            export PATH="/usr/sbin:$PATH"  # Add 'pkg_*' commands to path
+            export MOMMY_ZSH_SKIP=1  # zsh completion capturing totally does not work~
+
             echo "::group::Test script"
             gmake test
             echo "::endgroup::"