diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 168507e..4f58175 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -126,16 +126,15 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Install fpm && Build package - uses: cross-platform-actions/action@v0.22.0 + uses: vmactions/netbsd-vm@v1 with: - operating_system: netbsd - version: "9.3" - run: | + usesh: true + prepare: | set -e export PATH="/usr/sbin:$PATH" # Add 'pkg_*' commands to path echo "::group::Install basic packages" - sudo pkgin -y in git gmake mozilla-rootcerts-openssl + pkg_add git gmake mozilla-rootcerts-openssl echo "::endgroup::" echo "::group::Ignore ownership issues" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 474812c..1aa545d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -434,27 +434,26 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Test script and package - uses: cross-platform-actions/action@v0.22.0 + uses: vmactions/netbsd-vm@v1 with: - operating_system: netbsd - version: "9.3" - 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 + pkg_add git gmake mozilla-rootcerts-openssl echo "::endgroup::" echo "::group::Install ShellSpec" git clone --depth=1 https://github.com/shellspec/shellspec.git /tmp/shellspec/ - sudo gmake -C /tmp/shellspec/ install + gmake -C /tmp/shellspec/ install rm -rf /tmp/shellspec echo "::endgroup::" echo "::group::Install additional shells" - sudo pkgin -y in fish zsh + pkg_add fish zsh touch "$HOME/.zshrc" echo "::endgroup::" @@ -471,7 +470,7 @@ jobs: echo "::endgroup::" echo "::group::Install package" - sudo pkg_add ./dist/mommy-*+netbsd.tgz + pkg_add ./dist/mommy-*+netbsd.tgz echo "::endgroup::" echo "::group::Test package" @@ -479,7 +478,7 @@ jobs: echo "::endgroup::" echo "::group::Uninstall package" - sudo pkg_delete mommy + pkg_delete mommy echo "::endgroup::"