Skip to content

Commit dedb701

Browse files
authored
Merge pull request #1484 from murraystevenson/macCI10.6
CI : Reinstate `macos-arm64` job
2 parents b35dd41 + d47533b commit dedb701

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ jobs:
3333
linux-gcc11,
3434
linux-debug-gcc11,
3535
windows,
36-
windows-debug
36+
windows-debug,
37+
macos-arm64
3738
]
3839

3940
include:
@@ -76,6 +77,15 @@ jobs:
7677
publish: false
7778
jobs: 4
7879

80+
- name: macos-arm64
81+
os: macos-14
82+
buildType: RELEASE
83+
options: .github/workflows/main/options.posix
84+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-macos-arm64.tar.gz
85+
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
86+
publish: true
87+
jobs: 3
88+
7989
runs-on: ${{ matrix.os }}
8090

8191
container: ${{ matrix.containerImage }}

.github/workflows/main/options.posix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,5 @@ ENV_VARS_TO_IMPORT = "PATH CI"
6363

6464
if platform.system() == "Darwin" :
6565
os.environ["DYLD_FRAMEWORK_PATH"] = libs
66-
ENV_VARS_TO_IMPORT += " DYLD_FRAMEWORK_PATH"
66+
os.environ["PYTHONHOME"] = libs + "/Python.framework/Versions/" + pythonABIVersion
67+
ENV_VARS_TO_IMPORT += " DYLD_FRAMEWORK_PATH PYTHONHOME"

0 commit comments

Comments
 (0)