From 549f93b97fdeaff11a39f5d677ed92259bf9e4de Mon Sep 17 00:00:00 2001
From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com>
Date: Sun, 7 Sep 2025 09:18:27 -0700
Subject: [PATCH 1/2] CI : Reinstate `macos-arm64` job

---
 .github/workflows/main.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 83b2028ab3..20d108f783 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,7 +33,8 @@ jobs:
           linux-gcc11,
           linux-debug-gcc11,
           windows,
-          windows-debug
+          windows-debug,
+          macos-arm64
         ]
 
         include:
@@ -76,6 +77,15 @@ jobs:
             publish: false
             jobs: 4
 
+          - name: macos-arm64
+            os: macos-14
+            buildType: RELEASE
+            options: .github/workflows/main/options.posix
+            dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-macos-arm64.tar.gz
+            tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
+            publish: true
+            jobs: 3
+
     runs-on: ${{ matrix.os }}
 
     container: ${{ matrix.containerImage }}

From d47533b44c192a31122b2bafcd1922cdb82968b4 Mon Sep 17 00:00:00 2001
From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com>
Date: Sun, 7 Sep 2025 09:57:19 -0700
Subject: [PATCH 2/2] CI : Set `PYTHONHOME` on macOS

Without specifically defining `PYTHONHOME`, Python 3.11 reports `Could not find platform dependent libraries <exec_prefix>` and then fails to `import math` etc.

It looks like we're running into a similar issue as the one reported here: https://github.com/python/cpython/issues/95400
---
 .github/workflows/main/options.posix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main/options.posix b/.github/workflows/main/options.posix
index 6eaca8cd17..826a6ca678 100644
--- a/.github/workflows/main/options.posix
+++ b/.github/workflows/main/options.posix
@@ -63,4 +63,5 @@ ENV_VARS_TO_IMPORT = "PATH CI"
 
 if platform.system() == "Darwin" :
 	os.environ["DYLD_FRAMEWORK_PATH"] = libs
-	ENV_VARS_TO_IMPORT += " DYLD_FRAMEWORK_PATH"
+	os.environ["PYTHONHOME"] = libs + "/Python.framework/Versions/" + pythonABIVersion
+	ENV_VARS_TO_IMPORT += " DYLD_FRAMEWORK_PATH PYTHONHOME"