Skip to content

Commit d5093cf

Browse files
notimaginativenotimaginative
authored
Node v24 workflow update (#7536)
* update workflows for Node v24 support * fix safe-directory issue
1 parent e71e949 commit d5093cf

7 files changed

Lines changed: 136 additions & 65 deletions

File tree

‎.github/workflows/build-nightly.yaml‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ jobs:
2323
runs-on: ${{ matrix.os }}
2424
container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
2525
steps:
26-
- uses: actions/checkout@v1
26+
- uses: actions/checkout@v7
2727
name: Checkout
2828
with:
2929
submodules: true
30+
- name: Set workspace as safe
31+
# This appears to be broken in current actions, so do it manually
32+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
3033
- name: Configure CMake
3134
env:
3235
CONFIGURATION: ${{ matrix.configuration }}
@@ -51,31 +54,34 @@ jobs:
5154
CONFIGURATION: ${{ matrix.configuration }}
5255
run: $GITHUB_WORKSPACE/ci/linux/generate_appimage.sh $GITHUB_WORKSPACE/build/install
5356
- name: Upload build result
54-
uses: actions/upload-artifact@v4
57+
uses: actions/upload-artifact@v7
5558
with:
5659
name: linux-${{ matrix.configuration }}-${{ matrix.arch }}
5760
path: ${{ github.workspace }}/build/install/*.AppImage
5861
linux_zip:
5962
name: Build Linux distribution zip
6063
needs: build_linux
6164
runs-on: ubuntu-latest
62-
container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
65+
container: ghcr.io/scp-fs2open/sftp_upload:sha-844131c
6366
strategy:
6467
matrix:
6568
arch: [x86_64, arm64]
6669
steps:
67-
- uses: actions/checkout@v1
70+
- uses: actions/checkout@v7
6871
name: Checkout
6972
with:
7073
submodules: true
7174
fetch-depth: '0'
75+
- name: Set workspace as safe
76+
# This appears to be broken in current actions, so do it manually
77+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
7278
- name: Download Release builds
73-
uses: actions/download-artifact@v4
79+
uses: actions/download-artifact@v8
7480
with:
7581
name: linux-Release-${{ matrix.arch }}
7682
path: builds
7783
- name: Download FastDebug builds
78-
uses: actions/download-artifact@v4
84+
uses: actions/download-artifact@v8
7985
with:
8086
name: linux-FastDebug-${{ matrix.arch }}
8187
path: builds
@@ -106,10 +112,13 @@ jobs:
106112
name: Windows
107113
runs-on: windows-2022
108114
steps:
109-
- uses: actions/checkout@v1
115+
- uses: actions/checkout@v7
110116
name: Checkout
111117
with:
112118
submodules: true
119+
- name: Set workspace as safe
120+
# This appears to be broken in current actions, so do it manually
121+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
113122
# - name: Cache Qt
114123
# id: cache-qt-win
115124
# uses: actions/cache@v1
@@ -179,32 +188,35 @@ jobs:
179188
shell: bash
180189
run: ./bin/$CONFIGURATION/unittests --gtest_shuffle
181190
- name: Upload build result
182-
uses: actions/upload-artifact@v4
191+
uses: actions/upload-artifact@v7
183192
with:
184193
name: windows-${{ matrix.configuration }}-${{ matrix.arch }}-${{ matrix.simd }}
185194
path: ${{ github.workspace }}/build/install/*
186195
windows_zip:
187196
name: Build Windows distribution zip
188197
needs: build_windows
189198
runs-on: ubuntu-latest
190-
container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
199+
container: ghcr.io/scp-fs2open/sftp_upload:sha-844131c
191200
strategy:
192201
matrix:
193202
arch: [Win32, x64]
194203
simd: [SSE2]
195204
steps:
196-
- uses: actions/checkout@v1
205+
- uses: actions/checkout@v7
197206
name: Checkout
198207
with:
199208
submodules: true
200209
fetch-depth: '0'
210+
- name: Set workspace as safe
211+
# This appears to be broken in current actions, so do it manually
212+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
201213
- name: Download Release builds
202-
uses: actions/download-artifact@v4
214+
uses: actions/download-artifact@v8
203215
with:
204216
name: windows-Release-${{ matrix.arch }}-${{ matrix.simd }}
205217
path: builds
206218
- name: Download FastDebug builds
207-
uses: actions/download-artifact@v4
219+
uses: actions/download-artifact@v8
208220
with:
209221
name: windows-FastDebug-${{ matrix.arch }}-${{ matrix.simd }}
210222
path: builds
@@ -249,11 +261,14 @@ jobs:
249261
# setup-python: 'false'
250262
# aqtversion: ==1.1.3
251263
# py7zrversion: '==0.19.*'
252-
- uses: actions/checkout@v1
264+
- uses: actions/checkout@v7
253265
name: Checkout
254266
with:
255267
submodules: true
256268
fetch-depth: 0
269+
- name: Set workspace as safe
270+
# This appears to be broken in current actions, so do it manually
271+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
257272
- name: Prepare Vulkan SDK
258273
uses: humbletim/setup-vulkan-sdk@v1.2.1
259274
with:
@@ -302,32 +317,35 @@ jobs:
302317
# Ref: https://github.com/actions/runner-images/issues/2619
303318
run: gtar -cvzf macos-build-${{ matrix.configuration }}-${{ matrix.arch }}.tgz *.app
304319
- name: Upload build result
305-
uses: actions/upload-artifact@v4
320+
uses: actions/upload-artifact@v7
306321
with:
307322
name: mac-${{ matrix.configuration }}-${{ matrix.arch }}
308323
path: ${{ github.workspace }}/build/bin/macos-build-${{ matrix.configuration }}-${{ matrix.arch }}.tgz
309324
mac_zip:
310325
name: Build Mac distribution zip
311326
needs: build_mac
312327
runs-on: ubuntu-latest
313-
container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
328+
container: ghcr.io/scp-fs2open/sftp_upload:sha-844131c
314329
strategy:
315330
matrix:
316331
arch: [x86_64, arm64]
317332
steps:
318-
- uses: actions/checkout@v2
333+
- uses: actions/checkout@v7
319334
name: Checkout
320335
with:
321336
submodules: true
322337
fetch-depth: '0'
323338
ref: '${{ github.ref }}'
339+
- name: Set workspace as safe
340+
# This appears to be broken in current actions, so do it manually
341+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
324342
- name: Download Release builds
325-
uses: actions/download-artifact@v4
343+
uses: actions/download-artifact@v8
326344
with:
327345
name: mac-Release-${{ matrix.arch }}
328346
path: builds
329347
- name: Download FastDebug builds
330-
uses: actions/download-artifact@v4
348+
uses: actions/download-artifact@v8
331349
with:
332350
name: mac-FastDebug-${{ matrix.arch }}
333351
path: builds

‎.github/workflows/build-release.yaml‎

Lines changed: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,15 @@ jobs:
5252
runs-on: ${{ matrix.os }}
5353
container: ghcr.io/scp-fs2open/linux_build:sha-71099c9
5454
steps:
55-
- uses: actions/checkout@v1
55+
- uses: actions/checkout@v7
5656
# checks-out your repository under $GITHUB_WORKSPACE, so your workflow can access it.
5757
name: Checkout
5858
with:
5959
submodules: true # `true` to checkout submodules, `recursive` to recursively checkout submodules
6060
ref: '${{ github.ref }}'
61+
- name: Set workspace as safe
62+
# This appears to be broken in current actions, so do it manually
63+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
6164
- name: Configure CMake
6265
env:
6366
CONFIGURATION: ${{ matrix.configuration }}
@@ -82,7 +85,7 @@ jobs:
8285
CONFIGURATION: ${{ matrix.configuration }}
8386
run: $GITHUB_WORKSPACE/ci/linux/generate_appimage.sh $GITHUB_WORKSPACE/build/install
8487
- name: Upload build result
85-
uses: actions/upload-artifact@v4
88+
uses: actions/upload-artifact@v7
8689
# Upload the url file for use with other runners
8790
# upload-artifact.inputs:
8891
# if-no-files-found=warn What to do if path fails to find any files.
@@ -99,26 +102,29 @@ jobs:
99102
name: Build Linux distribution zip
100103
needs: build_linux
101104
runs-on: ubuntu-latest
102-
container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
105+
container: ghcr.io/scp-fs2open/sftp_upload:sha-844131c
103106
strategy:
104107
matrix:
105108
arch: [x86_64, arm64]
106109
steps:
107-
- uses: actions/checkout@v1
110+
- uses: actions/checkout@v7
108111
name: Checkout
109112
with:
110113
submodules: true
111114
fetch-depth: '0' # value 0 to fetch all history and tags for all branches
112115
ref: '${{ github.ref }}'
116+
- name: Set workspace as safe
117+
# This appears to be broken in current actions, so do it manually
118+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
113119
- name: Download Release builds
114120
# Grab the release builds
115-
uses: actions/download-artifact@v4
121+
uses: actions/download-artifact@v8
116122
with:
117123
name: linux-Release-${{ matrix.arch }}
118124
path: builds
119125
- name: Download FastDebug builds
120126
# Grab the debug builds
121-
uses: actions/download-artifact@v4
127+
uses: actions/download-artifact@v8
122128
with:
123129
name: linux-FastDebug-${{ matrix.arch }}
124130
path: builds
@@ -135,7 +141,7 @@ jobs:
135141
run: $GITHUB_WORKSPACE/ci/linux/create_dist_pack.sh Linux
136142
- name: Upload result package
137143
# Stash the result to artifact filespace
138-
uses: actions/upload-artifact@v4
144+
uses: actions/upload-artifact@v7
139145
with:
140146
name: ${{ steps.generate_package.outputs.package_name }}
141147
path: ${{ steps.generate_package.outputs.package_path }}
@@ -157,12 +163,15 @@ jobs:
157163
name: Windows
158164
runs-on: windows-2022
159165
steps:
160-
- uses: actions/checkout@v1
166+
- uses: actions/checkout@v7
161167
# Checkout repo
162168
name: Checkout
163169
with:
164170
submodules: true
165171
ref: '${{ github.ref }}'
172+
- name: Set workspace as safe
173+
# This appears to be broken in current actions, so do it manually
174+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
166175
# - name: Cache Qt
167176
# # Cache Qt
168177
# id: cache-qt-win
@@ -235,7 +244,7 @@ jobs:
235244
shell: bash
236245
run: ./bin/$CONFIGURATION/unittests --gtest_shuffle
237246
- name: Upload build result
238-
uses: actions/upload-artifact@v4
247+
uses: actions/upload-artifact@v7
239248
with:
240249
name: windows-${{ matrix.configuration }}-${{ matrix.arch }}-${{ matrix.simd }}
241250
path: ${{ github.workspace }}/build/install/*
@@ -244,28 +253,31 @@ jobs:
244253
name: Build Windows distribution zip
245254
needs: build_windows
246255
runs-on: ubuntu-latest
247-
container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
256+
container: ghcr.io/scp-fs2open/sftp_upload:sha-844131c
248257
strategy:
249258
fail-fast: false # Run the other jobs in the matrix instead of failing them
250259
matrix:
251260
arch: [Win32, x64]
252261
simd: [SSE2, AVX]
253262

254263
steps:
255-
- uses: actions/checkout@v1
264+
- uses: actions/checkout@v7
256265
name: Checkout
257266
with:
258267
submodules: true
259268
fetch-depth: '0'
260269
ref: '${{ github.ref }}'
270+
- name: Set workspace as safe
271+
# This appears to be broken in current actions, so do it manually
272+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
261273
- name: Download Release builds
262-
uses: actions/download-artifact@v4
274+
uses: actions/download-artifact@v8
263275
with:
264276
name: windows-Release-${{ matrix.arch }}-${{ matrix.simd }}
265277
path: builds
266278

267279
- name: Download FastDebug builds
268-
uses: actions/download-artifact@v4
280+
uses: actions/download-artifact@v8
269281
with:
270282
name: windows-FastDebug-${{ matrix.arch }}-${{ matrix.simd }}
271283
path: builds
@@ -280,13 +292,13 @@ jobs:
280292
run: $GITHUB_WORKSPACE/ci/linux/create_dist_pack.sh Windows
281293

282294
- name: Upload result package
283-
uses: actions/upload-artifact@v4
295+
uses: actions/upload-artifact@v7
284296
with:
285297
name: ${{ steps.generate_package.outputs.package_name }}
286298
path: ${{ steps.generate_package.outputs.package_path }}
287299

288300
- name: Upload debug package
289-
uses: actions/upload-artifact@v4
301+
uses: actions/upload-artifact@v7
290302
with:
291303
name: ${{ steps.generate_package.outputs.debug_name }}
292304
path: ${{ steps.generate_package.outputs.debug_path }}
@@ -324,12 +336,15 @@ jobs:
324336
# cached: ${{ steps.cache-qt-mac.outputs.cache-hit }}
325337
# setup-python: 'false'
326338
# aqtversion: ==1.1.3
327-
- uses: actions/checkout@v1
339+
- uses: actions/checkout@v7
328340
name: Checkout
329341
with:
330342
submodules: true
331343
fetch-depth: 0
332344
ref: '${{ github.ref }}'
345+
- name: Set workspace as safe
346+
# This appears to be broken in current actions, so do it manually
347+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
333348
- name: Prepare Vulkan SDK
334349
uses: humbletim/setup-vulkan-sdk@v1.2.1
335350
with:
@@ -372,32 +387,35 @@ jobs:
372387
# Ref: https://github.com/actions/runner-images/issues/2619
373388
run: gtar -cvzf macos-build-${{ matrix.configuration }}-${{ matrix.arch }}.tgz *.app
374389
- name: Upload build result
375-
uses: actions/upload-artifact@v4
390+
uses: actions/upload-artifact@v7
376391
with:
377392
name: mac-${{ matrix.configuration }}-${{ matrix.arch }}
378393
path: ${{ github.workspace }}/build/bin/macos-build-${{ matrix.configuration }}-${{ matrix.arch }}.tgz
379394
mac_zip:
380395
name: Build Mac distribution zip
381396
needs: build_mac
382397
runs-on: ubuntu-latest
383-
container: ghcr.io/scp-fs2open/sftp_upload:sha-748b19d
398+
container: ghcr.io/scp-fs2open/sftp_upload:sha-844131c
384399
strategy:
385400
matrix:
386401
arch: [x86_64, arm64]
387402
steps:
388-
- uses: actions/checkout@v2
403+
- uses: actions/checkout@v7
389404
name: Checkout
390405
with:
391406
submodules: true
392407
fetch-depth: '0'
393408
ref: '${{ github.ref }}'
409+
- name: Set workspace as safe
410+
# This appears to be broken in current actions, so do it manually
411+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
394412
- name: Download Release builds
395-
uses: actions/download-artifact@v4
413+
uses: actions/download-artifact@v8
396414
with:
397415
name: mac-Release-${{ matrix.arch }}
398416
path: builds
399417
- name: Download FastDebug builds
400-
uses: actions/download-artifact@v4
418+
uses: actions/download-artifact@v8
401419
with:
402420
name: mac-FastDebug-${{ matrix.arch }}
403421
path: builds
@@ -413,7 +431,7 @@ jobs:
413431
ARCH: ${{ matrix.arch }}
414432
run: $GITHUB_WORKSPACE/ci/linux/create_dist_pack.sh Mac
415433
- name: Upload result package
416-
uses: actions/upload-artifact@v4
434+
uses: actions/upload-artifact@v7
417435
with:
418436
name: ${{ steps.generate_package.outputs.package_name }}
419437
path: ${{ steps.generate_package.outputs.package_path }}

0 commit comments

Comments
 (0)