From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 2 Nov 2023 12:14:02 +0000 (+0000)
Subject: Use cross-platform actions for FreeBSD tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f3e7e7df570bcefab947fbc4b4ba30d3ec3ca65;p=thirdparty%2Ffreeradius-server.git

Use cross-platform actions for FreeBSD tests

This action appears to be under more active development / maintenance than vmactions/freebsd-vm
---

diff --git a/.github/workflows/ci-freebsd.yml b/.github/workflows/ci-freebsd.yml
index 4f21a089862..574d277b1e8 100644
--- a/.github/workflows/ci-freebsd.yml
+++ b/.github/workflows/ci-freebsd.yml
@@ -51,15 +51,15 @@ jobs:
         key: hostapd-freebsd-${{ env.HOSTAPD_GIT_TAG }}-v4
 
     - name: Test using a FreeBSD VirtualBox VM
-      uses: vmactions/freebsd-vm@v0
+      uses: cross-platform-actions/action@v0.21.0
       with:
-        usesh: true
-        sync: rsync
-        copyback: false
-        mem: 4096
-        envs: 'HOSTAPD_BUILD_DIR HOSTAPD_GIT_TAG'
-        prepare: |
-          pkg install -y         \
+        operating_system: freebsd
+        version: '13.2'
+        sync_files: runner-to-vm
+        memory: 4G
+        environment_variables: HOSTAPD_BUILD_DIR HOSTAPD_GIT_TAG
+        run: |
+          sudo pkg install -y    \
             curl                 \
             cyrus-sasl           \
             freetds              \
@@ -82,20 +82,16 @@ jobs:
             postgresql12-client  \
             talloc               \
             unixODBC
-          pip install tacacs_plus
-          echo "#! /bin/sh"               > /usr/local/bin/nproc
-          echo "sysctl -n hw.ncpu"        >> /usr/local/bin/nproc
-          chmod +x /usr/local/bin/nproc
-        run: |
+          sudo pip install tacacs_plus
+          echo "#! /bin/sh"        | sudo tee /usr/local/bin/nproc
+          echo "sysctl -n hw.ncpu" | sudo tee -a /usr/local/bin/nproc
+          sudo chmod +x /usr/local/bin/nproc
           freebsd-version
           cd freeradius
           ./configure
           gmake -j `nproc`
           gmake -j `nproc` test.keywords test.unit test.modules test.auth test.digest
           gmake test
-          # Minimise rsync pushback as it often fails with "ssh_dispatch_run_fatal: Connection to A.B.C.D: message authentication code incorrect"
-          git config --global --add safe.directory $(pwd)
-          git clean -fxd --exclude="$HOSTAPD_BUILD_DIR"
 
     #
     #  If the CI has failed and the branch is ci-debug then we start a tmate