Skip to content

Commit 6fd1532

Browse files
authored
Merge pull request #1443 from murraystevenson/ciUpdate
CI : Update for the Node20 future
2 parents 446d2e7 + 1a78c81 commit 6fd1532

File tree

1 file changed

+14
-27
lines changed

1 file changed

+14
-27
lines changed

.github/workflows/main.yml

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

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

4039
include:
4140

42-
- name: linux-gcc9
41+
- name: linux-gcc11
4342
os: ubuntu-20.04
4443
buildType: RELEASE
45-
containerImage: ghcr.io/gafferhq/build/build:2.1.2
44+
containerImage: ghcr.io/gafferhq/build/build:3.0.0
4645
options: .github/workflows/main/options.posix
47-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc9.tar.gz
46+
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc11.tar.gz
4847
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
4948
publish: true
5049

51-
- name: linux-debug-gcc9
50+
- name: linux-debug-gcc11
5251
os: ubuntu-20.04
5352
buildType: DEBUG
54-
containerImage: ghcr.io/gafferhq/build/build:2.1.2
55-
options: .github/workflows/main/options.posix
56-
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc9.tar.gz
57-
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
58-
publish: false
59-
60-
- name: linux-gcc11
61-
os: ubuntu-20.04
62-
buildType: RELEASE
6353
containerImage: ghcr.io/gafferhq/build/build:3.0.0
6454
options: .github/workflows/main/options.posix
6555
dependenciesURL: https://github.com/GafferHQ/dependencies/releases/download/8.0.1/gafferDependencies-8.0.1-linux-gcc11.tar.gz
6656
tests: testCore testCorePython testScene testImage testAlembic testUSD testVDB
67-
publish: true
57+
publish: false
6858

6959
- name: windows
7060
os: windows-2019
@@ -86,17 +76,11 @@ jobs:
8676

8777
container: ${{ matrix.containerImage }}
8878

89-
env:
90-
# GitHub have moved to running actions on Node20, which prevents them from
91-
# running on CentOS 7. The below allows actions to continue running on Node16
92-
# until October.
93-
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
94-
9579
steps:
9680

97-
- uses: actions/checkout@v3
81+
- uses: actions/checkout@v4
9882

99-
- uses: ilammy/msvc-dev-cmd@v1.12.1
83+
- uses: ilammy/msvc-dev-cmd@v1.13.0
10084
with:
10185
sdk: 10.0.17763.0
10286

@@ -161,7 +145,7 @@ jobs:
161145
shell: bash
162146

163147
- name: Cache
164-
uses: actions/cache@v3
148+
uses: actions/cache@v4
165149
with:
166150
path: sconsCache
167151
key: ${{ runner.os }}-${{ matrix.containerImage }}-${{env.CORTEX_DEPENDENCIES_HASH}}-${{ matrix.buildType }}-${{ github.sha }}
@@ -170,7 +154,7 @@ jobs:
170154
171155
- name: Build
172156
run: |
173-
scons -j 2 BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
157+
scons -j 4 BUILD_TYPE=${{ matrix.buildType }} OPTIONS=${{ matrix.options }} BUILD_CACHEDIR=sconsCache
174158
# Copy the config log for use in the "Debug Failures" step, because it
175159
# gets clobbered by the `scons test*` call below.
176160
cp config.log buildConfig.log
@@ -188,10 +172,13 @@ jobs:
188172
${{ env.PACKAGE_COMMAND }} ${{ env.CORTEX_BUILD_NAME }}.${{env.PACKAGE_EXTENSION}} ${{ env.CORTEX_BUILD_NAME }}
189173
if: matrix.publish
190174

191-
- uses: actions/upload-artifact@v3
175+
- uses: actions/upload-artifact@v4
192176
with:
193177
name: ${{ env.CORTEX_BUILD_NAME }}
194178
path: ${{ env.CORTEX_BUILD_NAME }}.${{ env.PACKAGE_EXTENSION }}
179+
# Using compression-level 0 avoids compressing our already compressed
180+
# package and results in a significantly faster upload.
181+
compression-level: 0
195182
if: matrix.publish
196183

197184
- name: Publish Release

0 commit comments

Comments
 (0)