Skip to content

Commit 6c6659c

Browse files
dschoGit for Windows Build Agent
authored andcommitted
Update GitHub Actions versions used in the GitHub workflows (#6220)
This includes gitgitgadget#2097 and a `fixup!` for a workflow that is not upstream (Nano Server).
2 parents 3a4749d + 17644e9 commit 6c6659c

6 files changed

Lines changed: 36 additions & 36 deletions

File tree

.github/workflows/check-style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
jobname: ClangFormat
2121
runs-on: ubuntu-latest
2222
steps:
23-
- uses: actions/checkout@v5
23+
- uses: actions/checkout@v6
2424
with:
2525
fetch-depth: 0
2626

.github/workflows/check-whitespace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
check-whitespace:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0
2525

.github/workflows/coverity.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
COVERITY_LANGUAGE: cxx
3939
COVERITY_PLATFORM: overridden-below
4040
steps:
41-
- uses: actions/checkout@v5
41+
- uses: actions/checkout@v6
4242
- name: install minimal Git for Windows SDK
4343
if: contains(matrix.os, 'windows')
44-
uses: git-for-windows/setup-git-for-windows-sdk@v1
44+
uses: git-for-windows/setup-git-for-windows-sdk@v2
4545
- run: ci/install-dependencies.sh
4646
if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
4747
env:

.github/workflows/l10n.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
cat git-po-helper.out
9393
exit $exit_code
9494
- name: Create comment in pull request for report
95-
uses: mshick/add-pr-comment@v2
95+
uses: mshick/add-pr-comment@v3
9696
if: >-
9797
always() &&
9898
github.event_name == 'pull_request_target' &&

.github/workflows/main.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
echo "skip_concurrent=$skip_concurrent" >>$GITHUB_OUTPUT
6464
- name: skip if the commit or tree was already tested
6565
id: skip-if-redundant
66-
uses: actions/github-script@v8
66+
uses: actions/github-script@v9
6767
if: steps.check-ref.outputs.enabled == 'yes'
6868
with:
6969
github-token: ${{secrets.GITHUB_TOKEN}}
@@ -112,8 +112,8 @@ jobs:
112112
group: windows-build-${{ github.ref }}
113113
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
114114
steps:
115-
- uses: actions/checkout@v5
116-
- uses: git-for-windows/setup-git-for-windows-sdk@v1
115+
- uses: actions/checkout@v6
116+
- uses: git-for-windows/setup-git-for-windows-sdk@v2
117117
- name: build
118118
shell: bash
119119
env:
@@ -123,7 +123,7 @@ jobs:
123123
- name: zip up tracked files
124124
run: git archive -o artifacts/tracked.tar.gz HEAD
125125
- name: upload tracked files and build artifacts
126-
uses: actions/upload-artifact@v5
126+
uses: actions/upload-artifact@v7
127127
with:
128128
name: windows-artifacts
129129
path: artifacts
@@ -140,14 +140,14 @@ jobs:
140140
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
141141
steps:
142142
- name: download tracked files and build artifacts
143-
uses: actions/download-artifact@v6
143+
uses: actions/download-artifact@v8
144144
with:
145145
name: windows-artifacts
146146
path: ${{github.workspace}}
147147
- name: extract tracked files and build artifacts
148148
shell: bash
149149
run: tar xf artifacts.tar.gz && tar xf tracked.tar.gz
150-
- uses: git-for-windows/setup-git-for-windows-sdk@v1
150+
- uses: git-for-windows/setup-git-for-windows-sdk@v2
151151
- name: test
152152
shell: bash
153153
run: . /etc/profile && ci/run-test-slice.sh $((${{matrix.nr}} + 1)) 10
@@ -157,7 +157,7 @@ jobs:
157157
run: ci/print-test-failures.sh
158158
- name: Upload failed tests' directories
159159
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
160-
uses: actions/upload-artifact@v5
160+
uses: actions/upload-artifact@v7
161161
with:
162162
name: failed-tests-windows-${{ matrix.nr }}
163163
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -176,10 +176,10 @@ jobs:
176176
group: vs-build-${{ github.ref }}-${{ matrix.arch }}
177177
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
178178
steps:
179-
- uses: actions/checkout@v5
180-
- uses: git-for-windows/setup-git-for-windows-sdk@v1
179+
- uses: actions/checkout@v6
180+
- uses: git-for-windows/setup-git-for-windows-sdk@v2
181181
- name: initialize vcpkg
182-
uses: actions/checkout@v5
182+
uses: actions/checkout@v6
183183
with:
184184
repository: 'microsoft/vcpkg'
185185
path: 'compat/vcbuild/vcpkg'
@@ -189,7 +189,7 @@ jobs:
189189
repository: git/git
190190
definitionId: 9
191191
- name: add msbuild to PATH
192-
uses: microsoft/setup-msbuild@v2
192+
uses: microsoft/setup-msbuild@v3
193193
- name: copy dlls to root
194194
shell: cmd
195195
run: compat\vcbuild\vcpkg_copy_dlls.bat release ${{ matrix.arch }}-windows
@@ -211,7 +211,7 @@ jobs:
211211
- name: zip up tracked files
212212
run: git archive -o artifacts/tracked.tar.gz HEAD
213213
- name: upload tracked files and build artifacts
214-
uses: actions/upload-artifact@v5
214+
uses: actions/upload-artifact@v7
215215
with:
216216
name: vs-artifacts-${{ matrix.arch }}
217217
path: artifacts
@@ -227,9 +227,9 @@ jobs:
227227
group: vs-test-${{ matrix.nr }}-${{ github.ref }}
228228
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
229229
steps:
230-
- uses: git-for-windows/setup-git-for-windows-sdk@v1
230+
- uses: git-for-windows/setup-git-for-windows-sdk@v2
231231
- name: download tracked files and build artifacts
232-
uses: actions/download-artifact@v6
232+
uses: actions/download-artifact@v8
233233
with:
234234
name: vs-artifacts-x64
235235
path: ${{github.workspace}}
@@ -247,7 +247,7 @@ jobs:
247247
run: ci/print-test-failures.sh
248248
- name: Upload failed tests' directories
249249
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
250-
uses: actions/upload-artifact@v5
250+
uses: actions/upload-artifact@v7
251251
with:
252252
name: failed-tests-windows-vs-${{ matrix.nr }}
253253
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -261,7 +261,7 @@ jobs:
261261
group: windows-meson-build-${{ github.ref }}
262262
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
263263
steps:
264-
- uses: actions/checkout@v5
264+
- uses: actions/checkout@v6
265265
- uses: actions/setup-python@v6
266266
- name: Set up dependencies
267267
shell: pwsh
@@ -273,7 +273,7 @@ jobs:
273273
shell: pwsh
274274
run: meson compile -C build
275275
- name: Upload build artifacts
276-
uses: actions/upload-artifact@v5
276+
uses: actions/upload-artifact@v7
277277
with:
278278
name: windows-meson-artifacts
279279
path: build
@@ -289,13 +289,13 @@ jobs:
289289
group: windows-meson-test-${{ matrix.nr }}-${{ github.ref }}
290290
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
291291
steps:
292-
- uses: actions/checkout@v5
292+
- uses: actions/checkout@v6
293293
- uses: actions/setup-python@v6
294294
- name: Set up dependencies
295295
shell: pwsh
296296
run: pip install meson ninja
297297
- name: Download build artifacts
298-
uses: actions/download-artifact@v6
298+
uses: actions/download-artifact@v8
299299
with:
300300
name: windows-meson-artifacts
301301
path: build
@@ -308,7 +308,7 @@ jobs:
308308
run: ci/print-test-failures.sh
309309
- name: Upload failed tests' directories
310310
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
311-
uses: actions/upload-artifact@v4
311+
uses: actions/upload-artifact@v7
312312
with:
313313
name: failed-tests-windows-meson-${{ matrix.nr }}
314314
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -344,15 +344,15 @@ jobs:
344344
TEST_OUTPUT_DIRECTORY: ${{github.workspace}}/t
345345
runs-on: ${{matrix.vector.pool}}
346346
steps:
347-
- uses: actions/checkout@v5
347+
- uses: actions/checkout@v6
348348
- run: ci/install-dependencies.sh
349349
- run: ci/run-build-and-tests.sh
350350
- name: print test failures
351351
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
352352
run: ci/print-test-failures.sh
353353
- name: Upload failed tests' directories
354354
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
355-
uses: actions/upload-artifact@v5
355+
uses: actions/upload-artifact@v7
356356
with:
357357
name: failed-tests-${{matrix.vector.jobname}}
358358
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -365,7 +365,7 @@ jobs:
365365
CI_JOB_IMAGE: ubuntu-latest
366366
runs-on: ubuntu-latest
367367
steps:
368-
- uses: actions/checkout@v5
368+
- uses: actions/checkout@v6
369369
- run: ci/install-dependencies.sh
370370
- run: ci/run-build-and-minimal-fuzzers.sh
371371
dockerized:
@@ -444,7 +444,7 @@ jobs:
444444
else
445445
apt-get -q update && apt-get -q -y install git
446446
fi
447-
- uses: actions/checkout@v5
447+
- uses: actions/checkout@v6
448448
- run: ci/install-dependencies.sh
449449
- run: useradd builder --create-home
450450
- run: chown -R builder .
@@ -454,7 +454,7 @@ jobs:
454454
run: sudo --preserve-env --set-home --user=builder ci/print-test-failures.sh
455455
- name: Upload failed tests' directories
456456
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
457-
uses: actions/upload-artifact@v5
457+
uses: actions/upload-artifact@v7
458458
with:
459459
name: failed-tests-${{matrix.vector.jobname}}
460460
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -469,7 +469,7 @@ jobs:
469469
group: static-analysis-${{ github.ref }}
470470
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
471471
steps:
472-
- uses: actions/checkout@v5
472+
- uses: actions/checkout@v6
473473
- run: ci/install-dependencies.sh
474474
- run: ci/run-static-analysis.sh
475475
- run: ci/check-directional-formatting.bash
@@ -485,7 +485,7 @@ jobs:
485485
group: rust-analysis-${{ github.ref }}
486486
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
487487
steps:
488-
- uses: actions/checkout@v5
488+
- uses: actions/checkout@v6
489489
- run: ci/install-dependencies.sh
490490
- run: ci/run-rust-checks.sh
491491
sparse:
@@ -499,7 +499,7 @@ jobs:
499499
group: sparse-${{ github.ref }}
500500
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
501501
steps:
502-
- uses: actions/checkout@v5
502+
- uses: actions/checkout@v6
503503
- name: Install other dependencies
504504
run: ci/install-dependencies.sh
505505
- run: make sparse
@@ -515,6 +515,6 @@ jobs:
515515
CI_JOB_IMAGE: ubuntu-latest
516516
runs-on: ubuntu-latest
517517
steps:
518-
- uses: actions/checkout@v5
518+
- uses: actions/checkout@v6
519519
- run: ci/install-dependencies.sh
520520
- run: ci/test-documentation.sh

.github/workflows/nano-server.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
IMAGE: mcr.microsoft.com/powershell:nanoserver-ltsc2022
1515

1616
steps:
17-
- uses: actions/checkout@v5
18-
- uses: git-for-windows/setup-git-for-windows-sdk@v1
17+
- uses: actions/checkout@v6
18+
- uses: git-for-windows/setup-git-for-windows-sdk@v2
1919
- name: build Git
2020
shell: bash
2121
run: make -j15

0 commit comments

Comments
 (0)