Skip to content

Commit dc4a6a5

Browse files
authored
Merge pull request #1296 from johnhaddon/dependenciesUpdate
CI : Update to GafferHQ/dependencies 5.1.0
2 parents 5d4466b + 9249cba commit dc4a6a5

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
linux-python2,
3434
linux-python2-debug,
3535
linux-python3,
36-
macos-python2
3736
]
3837

3938
include:
@@ -43,7 +42,7 @@ jobs:
4342
buildType: RELEASE
4443
containerImage: ghcr.io/gafferhq/build/build:2.0.0
4544
options: .github/workflows/main/options.posix
46-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.0.0a3/gafferDependencies-5.0.0a3-Python2-linux.tar.gz
45+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python2-linux.tar.gz
4746
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
4847
publish: true
4948

@@ -52,7 +51,7 @@ jobs:
5251
buildType: DEBUG
5352
containerImage: ghcr.io/gafferhq/build/build:2.0.0
5453
options: .github/workflows/main/options.posix
55-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.0.0a3/gafferDependencies-5.0.0a3-Python2-linux.tar.gz
54+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python2-linux.tar.gz
5655
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
5756
publish: false
5857

@@ -61,33 +60,23 @@ jobs:
6160
buildType: RELEASE
6261
containerImage: ghcr.io/gafferhq/build/build:2.0.0
6362
options: .github/workflows/main/options.posix
64-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.0.0a3/gafferDependencies-5.0.0a3-Python2-linux.tar.gz
63+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python3-linux.tar.gz
6564
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
6665
publish: true
6766

68-
- name: macos-python2
69-
os: macos-10.15
70-
buildType: RELEASE
71-
containerImage:
72-
options: .github/workflows/main/options.posix
73-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.0.0a3/gafferDependencies-5.0.0a3-Python2-osx.tar.gz
74-
# `testAppleseed` currently omitted due to clashes with system image IO frameworks.
75-
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
76-
publish: true
77-
7867
- name: windows-python3
7968
os: windows-2019
8069
buildType: RELEASE
8170
options: .github/workflows/main/options.windows
82-
dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.0.0/gafferDependencies-6.0.0-Python3-windows.zip
71+
dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.1.0/gafferDependencies-6.1.0-Python3-windows.zip
8372
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
8473
publish: false
8574

8675
- name: windows-python3-debug
8776
os: windows-2019
8877
buildType: RELWITHDEBINFO
8978
options: .github/workflows/main/options.windows
90-
dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.0.0/gafferDependencies-6.0.0-Python3-windows.zip
79+
dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.1.0/gafferDependencies-6.1.0-Python3-windows.zip
9180
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
9281
publish: false
9382

0 commit comments

Comments
 (0)