Skip to content

Commit fbd8eac

Browse files
committed
CI : Update to GafferHQ/dependencies 6.0.0
This will allow us to use Cortex release packages in Gaffer 1.2.x.
1 parent 1e2ecfb commit fbd8eac

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

.github/workflows/main.yml

+7-17
Original file line numberDiff line numberDiff line change
@@ -30,55 +30,45 @@ jobs:
3030
# and then use `include` to define their settings.
3131

3232
name: [
33-
linux-python2,
34-
linux-python2-debug,
3533
linux-python3,
34+
linux-python3-debug,
3635
windows-python3,
3736
windows-python3-debug
3837
]
3938

4039
include:
4140

42-
- name: linux-python2
41+
- name: linux-python3
4342
os: ubuntu-20.04
4443
buildType: RELEASE
4544
containerImage: ghcr.io/gafferhq/build/build:2.0.0
4645
options: .github/workflows/main/options.posix
47-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python2-linux.tar.gz
46+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-linux.tar.gz
4847
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
4948
publish: true
5049

51-
- name: linux-python2-debug
50+
- name: linux-python3-debug
5251
os: ubuntu-20.04
5352
buildType: DEBUG
5453
containerImage: ghcr.io/gafferhq/build/build:2.0.0
5554
options: .github/workflows/main/options.posix
56-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python2-linux.tar.gz
55+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-linux.tar.gz
5756
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
5857
publish: false
5958

60-
- name: linux-python3
61-
os: ubuntu-20.04
62-
buildType: RELEASE
63-
containerImage: ghcr.io/gafferhq/build/build:2.0.0
64-
options: .github/workflows/main/options.posix
65-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/5.1.0/gafferDependencies-5.1.0-Python3-linux.tar.gz
66-
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB testAppleseed
67-
publish: true
68-
6959
- name: windows-python3
7060
os: windows-2019
7161
buildType: RELEASE
7262
options: .github/workflows/main/options.windows
73-
dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.2.1/gafferDependencies-6.2.1-Python3-windows.zip
63+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-windows.zip
7464
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
7565
publish: true
7666

7767
- name: windows-python3-debug
7868
os: windows-2019
7969
buildType: RELWITHDEBINFO
8070
options: .github/workflows/main/options.windows
81-
dependenciesURL: https://github.com/hypothetical-inc/gafferDependencies/releases/download/6.2.1/gafferDependencies-6.2.1-Python3-windows.zip
71+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/6.0.0/gafferDependencies-6.0.0-windows.zip
8272
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
8373
publish: false
8474

Changes

+5
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ Fixes
1212
- ImageReader : Fixed compilation with versions of OIIO < 2.4.
1313
- USDScene : Invalid primitive variables are now skipped during loading, with a warning being emitted instead.
1414

15+
Build
16+
-----
17+
18+
- Updated CI builds to use GafferHQ/dependencies version `6.0.0`, making them suitable for use in Gaffer `1.2.x.x`.
19+
1520
10.4.5.0 (relative to 10.4.4.0)
1621
========
1722

0 commit comments

Comments
 (0)