Skip to content

Commit 278fc09

Browse files
committed
CI : Update to GafferHQ/dependencies 8.0.1
1 parent 4bd6000 commit 278fc09

File tree

3 files changed

+30
-18
lines changed

3 files changed

+30
-18
lines changed

.github/workflows/main.yml

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,55 @@ jobs:
3030
# and then use `include` to define their settings.
3131

3232
name: [
33-
linux-python3,
34-
linux-python3-debug,
35-
windows-python3,
36-
windows-python3-debug
33+
linux-gcc9,
34+
linux-debug-gcc9,
35+
linux-gcc11,
36+
windows,
37+
windows-debug
3738
]
3839

3940
include:
4041

41-
- name: linux-python3
42+
- name: linux-gcc9
4243
os: ubuntu-20.04
4344
buildType: RELEASE
44-
containerImage: ghcr.io/gafferhq/build/build:2.0.0
45+
containerImage: ghcr.io/gafferhq/build/build:2.1.2
4546
options: .github/workflows/main/options.posix
46-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/7.0.0/gafferDependencies-7.0.0-linux.tar.gz
47+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc9.tar.gz
4748
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
4849
publish: true
4950

50-
- name: linux-python3-debug
51+
- name: linux-debug-gcc9
5152
os: ubuntu-20.04
5253
buildType: DEBUG
53-
containerImage: ghcr.io/gafferhq/build/build:2.0.0
54+
containerImage: ghcr.io/gafferhq/build/build:2.1.2
5455
options: .github/workflows/main/options.posix
55-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/7.0.0/gafferDependencies-7.0.0-linux.tar.gz
56+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc9.tar.gz
5657
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
5758
publish: false
5859

59-
- name: windows-python3
60+
- name: linux-gcc11
61+
os: ubuntu-20.04
62+
buildType: RELEASE
63+
containerImage: ghcr.io/gafferhq/build/build:3.0.0
64+
options: .github/workflows/main/options.posix
65+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc11.tar.gz
66+
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
67+
publish: true
68+
69+
- name: windows
6070
os: windows-2019
6171
buildType: RELEASE
6272
options: .github/workflows/main/options.windows
63-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/7.0.0/gafferDependencies-7.0.0-windows.zip
73+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-windows.zip
6474
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
6575
publish: true
6676

67-
- name: windows-python3-debug
77+
- name: windows-debug
6878
os: windows-2019
6979
buildType: RELWITHDEBINFO
7080
options: .github/workflows/main/options.windows
71-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/7.0.0/gafferDependencies-7.0.0-windows.zip
81+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-windows.zip
7282
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
7383
publish: false
7484

.github/workflows/main/options.posix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ LIBPATH = libs
1919

2020
PYTHON = deps + "/bin/python"
2121

22-
if os.path.exists( deps + "/bin/python3" ) :
23-
pythonABIVersion = "3.7m"
24-
else :
25-
pythonABIVersion = "2.7"
22+
pythonABIVersion = "3.10"
2623

2724
PYTHON_LINK_FLAGS = "-lpython" + pythonABIVersion
2825

Changes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ Fixes
77
- ShaderNetworkAlgo : Fixed crash caused by cyclic connections in `removeUnusedShaders()`.
88
- ShaderStateComponent : Fixed GL rendering failures caused by unsupported values for texture parameters.
99

10+
Build
11+
-----
12+
13+
- CI : Updated to GafferHQ/dependencies 8.0.1.
14+
1015
10.5.7.1 (relative to 10.5.7.0)
1116
========
1217

0 commit comments

Comments
 (0)