From beff30d84fd89c52754091055868efb868356e5d Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Mon, 22 Apr 2024 14:30:37 -0400
Subject: ci/openbsd: Use cross-platform-actions

---
 .github/workflows/ci.yml | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd10df8..b977580 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,27 +94,21 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run tests
-        uses: vmactions/openbsd-vm@v1
+        uses: cross-platform-actions/action@v0.24.0
         with:
-          release: "7.5"
-          usesh: true
-          copyback: false
+          operating_system: openbsd
+          version: "7.5"
+          sync_files: runner-to-vm
 
-          prepare: |
-            pkg_add \
+          run: |
+            sudo pkg_add \
                 bash \
                 expect \
                 gmake \
                 oniguruma
-            adduser -group USER -batch action wheel </dev/null
-            cp /etc/examples/doas.conf /etc/doas.conf
-            echo "permit nopass keepenv :wheel" >>/etc/doas.conf
-
-          run: |
-            chown -R action:action .
             jobs=$(sysctl -n hw.ncpu)
-            doas -u action gmake config
-            doas -u action gmake -j$jobs check TEST_FLAGS="--sudo=doas --verbose=skipped"
+            gmake -j$jobs config
+            gmake -j$jobs check TEST_FLAGS="--sudo --verbose=skipped"
 
   netbsd:
     name: NetBSD
-- 
cgit v1.2.3