Skip to content

Commit d0425b6

Browse files
authored
Merge pull request #1511 from murraystevenson/dualPlatformCI
CI : Update to GafferHQ/dependencies 11.0.0a2
2 parents 962af08 + 9bc4636 commit d0425b6

2 files changed

Lines changed: 32 additions & 16 deletions

File tree

.github/workflows/main.yml

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,58 +30,69 @@ jobs:
3030
# and then use `include` to define their settings.
3131

3232
name: [
33-
linux-gcc11,
34-
linux-debug-gcc11,
35-
windows,
36-
windows-debug,
37-
macos-arm64
33+
linux-platform24,
34+
linux-platform25,
35+
linux-debug-platform25,
36+
windows-platform25,
37+
windows-debug-platform25,
38+
macos-arm64-platform25
3839
]
3940

4041
include:
4142

42-
- name: linux-gcc11
43+
- name: linux-platform24
4344
os: ubuntu-24.04
4445
buildType: RELEASE
45-
containerImage: ghcr.io/gafferhq/build/build:3.0.0
46+
containerImage: ghcr.io/gafferhq/build/build:3.4.0
4647
options: .github/workflows/main/options.posix
4748
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-linux-gcc11.tar.gz
4849
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
4950
publish: true
5051
jobs: 4
5152

52-
- name: linux-debug-gcc11
53+
- name: linux-platform25
54+
os: ubuntu-24.04
55+
buildType: RELEASE
56+
containerImage: ghcr.io/gafferhq/build/build:4.0.0a1
57+
options: .github/workflows/main/options.posix
58+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/11.0.0a2/gafferDependencies-11.0.0a2-linux-gcc11.tar.gz
59+
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
60+
publish: true
61+
jobs: 4
62+
63+
- name: linux-debug-platform25
5364
os: ubuntu-24.04
5465
buildType: DEBUG
55-
containerImage: ghcr.io/gafferhq/build/build:3.0.0
66+
containerImage: ghcr.io/gafferhq/build/build:4.0.0a1
5667
options: .github/workflows/main/options.posix
57-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-linux-gcc11.tar.gz
68+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/11.0.0a2/gafferDependencies-11.0.0a2-linux-gcc11.tar.gz
5869
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
5970
publish: false
6071
jobs: 4
6172

62-
- name: windows
73+
- name: windows-platform25
6374
os: windows-2022
6475
buildType: RELEASE
6576
options: .github/workflows/main/options.windows
66-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-windows.zip
77+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/11.0.0a2/gafferDependencies-11.0.0a2-windows.zip
6778
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
6879
publish: true
6980
jobs: 4
7081

71-
- name: windows-debug
82+
- name: windows-debug-platform25
7283
os: windows-2022
7384
buildType: RELWITHDEBINFO
7485
options: .github/workflows/main/options.windows
75-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/10.0.0/gafferDependencies-10.0.0-windows.zip
86+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/11.0.0a2/gafferDependencies-11.0.0a2-windows.zip
7687
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
7788
publish: false
7889
jobs: 4
7990

80-
- name: macos-arm64
91+
- name: macos-arm64-platform25
8192
os: macos-14
8293
buildType: RELEASE
8394
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
95+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/11.0.0a2/gafferDependencies-11.0.0a2-macos-arm64.tar.gz
8596
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
8697
publish: true
8798
jobs: 3

Changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
10.7.x.x (relative to 10.7.0.0a3)
22
========
33

4+
Build
5+
-----
46

7+
- CI :
8+
- Updated to GafferHQ/dependencies 11.0.0a2.
9+
- Build artifacts and releases now include a "-platform##" suffix denoting their target VFX Reference Platform year. This replaces the "gcc" suffix previously used on Linux builds.
510

611
10.7.0.0a3 (relative to 10.7.0.0a2)
712
==========

0 commit comments

Comments
 (0)