From 6f1b13c7eb9225033f16eaa8b0093787663627f0 Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Fri, 17 May 2024 09:43:36 -0400
Subject: [PATCH] Enforce x86_64 Python for x86_64-only build

---
 .github/workflows/actions.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
index aee82ee..a3e711f 100644
--- a/.github/workflows/actions.yml
+++ b/.github/workflows/actions.yml
@@ -20,7 +20,6 @@ jobs:
           - pyqt5
     steps:
       - uses: actions/checkout@v4
-
       - uses: actions/setup-python@v5
         with:
           python-version: 3.11.4
@@ -34,7 +33,7 @@ jobs:
         run: mv client/dist/NSO-RPC.exe client/dist/NSO-RPC-qt5.exe
       - name: Upload Build
         if: github.event_name != 'pull_request'
-        uses: softprops/action-gh-release@v2.0.4
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             client/dist/NSO-RPC*.exe
@@ -53,19 +52,18 @@ jobs:
         continue-on-error: false
       - name: Upload Build
         if: github.event_name != 'pull_request'
-        uses: softprops/action-gh-release@v2.0.4
+        uses: softprops/action-gh-release@v2
         with:
           files: scripts/linux.sh
   build-macos:
     name: Build NSO-RPC - MacOS
-    # We cannot use arm64 macOS runners until setup-python permits specifying an architecture.
-    # See also: https://github.com/actions/setup-python/issues/547
-    runs-on: macos-12
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: 3.11.4
+          architecture: x64
       # We initially use `arch -x86_64` to ensure that we use an x86_64 version
       # of Python, regardless of the host architecture.
       # Subsequent invocations will all use the x86_64 `python3` binary within the venv.
@@ -83,7 +81,7 @@ jobs:
           zip -yr mac-portable.zip NSO-RPC.app/
       - name: Upload Build
         if: github.event_name != 'pull_request'
-        uses: softprops/action-gh-release@v2.0.4
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             client/dist/mac-installer.dmg
@@ -93,7 +91,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install Python 3.11.4 and build NSO-RPC
+      - name: Install Universal Python 3.11.4
         run: >
           curl https://www.python.org/ftp/python/3.11.4/python-3.11.4-macos11.pkg -o python-3.11.4-macos11.pkg &&
           sudo installer -verbose -pkg python-3.11.4-macos11.pkg -target /
@@ -112,7 +110,7 @@ jobs:
           zip -yr mac-universal2-portable.zip NSO-RPC.app/
       - name: Upload NSO-RPC Universal2 Build
         if: github.event_name != 'pull_request'
-        uses: softprops/action-gh-release@v2.0.4
+        uses: softprops/action-gh-release@v2
         with:
           files: |
             client/dist/mac-universal2-installer.dmg
@@ -133,6 +131,6 @@ jobs:
           hash-type: sha256
           file-name: checksums.txt
           get-assets: true
-      - uses: softprops/action-gh-release@v2.0.4
+      - uses: softprops/action-gh-release@v2
         with:
           files: checksums.txt