From 9672b534a48a792fa6b7c8d0527cc17d2dc4c682 Mon Sep 17 00:00:00 2001
From: Giampaolo Rodola <g.rodola@gmail.com>
Date: Tue, 11 Apr 2023 14:37:41 +0200
Subject: [PATCH] create separate freebsd.yml file

---
 .github/workflows/build.yml   | 26 +-------------------------
 .github/workflows/freebsd.yml | 25 +++++++++++++++++++++++++
 .github/workflows/openbsd.yml |  1 +
 3 files changed, 27 insertions(+), 25 deletions(-)
 create mode 100644 .github/workflows/freebsd.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 35187a0df..b1cdedf92 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -109,31 +109,7 @@ jobs:
   #       make generate-manifest
   #       python setup.py sdist
   #       mv dist/psutil*.tar.gz wheelhouse/
-
-  # FreeBSD (tests only)
-  py3-freebsd:
-    runs-on: macos-12
-    steps:
-    - name: Cancel previous runs
-      uses: styfle/cancel-workflow-action@0.9.1
-      with:
-        access_token: ${{ github.token }}
-
-    - uses: actions/checkout@v3
-
-    - name: Run tests
-      id: test
-      uses: vmactions/freebsd-vm@v0
-      with:
-        usesh: true
-        prepare: pkg install -y gcc python3
-        run: |
-          set +e
-          python3 -m pip install --user setuptools
-          make install
-          make test
-          make test-memleaks
-
+  #
   # # Run linters
   # linters:
   #   runs-on: ubuntu-latest
diff --git a/.github/workflows/freebsd.yml b/.github/workflows/freebsd.yml
new file mode 100644
index 000000000..6d877210f
--- /dev/null
+++ b/.github/workflows/freebsd.yml
@@ -0,0 +1,25 @@
+# https://github.com/vmactions/freebsd-vm
+on: [push, pull_request]
+name: build
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.sha || '' }}
+  cancel-in-progress: true
+jobs:
+  py3-freebsd:
+    runs-on: macos-12
+    steps:
+      - uses: actions/checkout@v3
+      - name: Run tests
+        id: test-freebsd
+        uses: vmactions/freebsd-vm@v0
+        with:
+          usesh: true
+          prepare: |
+            pkg install -y gcc python3
+          run: |
+            set +e
+            make install-pip
+            python3 -m pip install --user setuptools
+            make install
+            make test
+            make test-memleaks
diff --git a/.github/workflows/openbsd.yml b/.github/workflows/openbsd.yml
index edd31977a..e9b83f695 100644
--- a/.github/workflows/openbsd.yml
+++ b/.github/workflows/openbsd.yml
@@ -19,6 +19,7 @@ jobs:
             pkg_add gcc python3
           run: |
             set +e
+            make install-pip
             python3 -m pip install --user setuptools
             make install
             make test