Skip to content

Commit 67170af

Browse files
committed
Merge branch 'pr-2097'
This corresponds to gitgitgadget#2097.
2 parents c2a42d6 + 8ed8f03 commit 67170af

5 files changed

Lines changed: 34 additions & 34 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
@@ -213,7 +213,7 @@ jobs:
213213
- name: zip up tracked files
214214
run: git archive -o artifacts/tracked.tar.gz HEAD
215215
- name: upload tracked files and build artifacts
216-
uses: actions/upload-artifact@v5
216+
uses: actions/upload-artifact@v7
217217
with:
218218
name: vs-artifacts-${{ matrix.arch }}
219219
path: artifacts
@@ -229,9 +229,9 @@ jobs:
229229
group: vs-test-${{ matrix.nr }}-${{ github.ref }}
230230
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
231231
steps:
232-
- uses: git-for-windows/setup-git-for-windows-sdk@v1
232+
- uses: git-for-windows/setup-git-for-windows-sdk@v2
233233
- name: download tracked files and build artifacts
234-
uses: actions/download-artifact@v6
234+
uses: actions/download-artifact@v8
235235
with:
236236
name: vs-artifacts-x64
237237
path: ${{github.workspace}}
@@ -249,7 +249,7 @@ jobs:
249249
run: ci/print-test-failures.sh
250250
- name: Upload failed tests' directories
251251
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
252-
uses: actions/upload-artifact@v5
252+
uses: actions/upload-artifact@v7
253253
with:
254254
name: failed-tests-windows-vs-${{ matrix.nr }}
255255
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -263,7 +263,7 @@ jobs:
263263
group: windows-meson-build-${{ github.ref }}
264264
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
265265
steps:
266-
- uses: actions/checkout@v5
266+
- uses: actions/checkout@v6
267267
- uses: actions/setup-python@v6
268268
- name: Set up dependencies
269269
shell: pwsh
@@ -275,7 +275,7 @@ jobs:
275275
shell: pwsh
276276
run: meson compile -C build
277277
- name: Upload build artifacts
278-
uses: actions/upload-artifact@v5
278+
uses: actions/upload-artifact@v7
279279
with:
280280
name: windows-meson-artifacts
281281
path: build
@@ -291,13 +291,13 @@ jobs:
291291
group: windows-meson-test-${{ matrix.nr }}-${{ github.ref }}
292292
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
293293
steps:
294-
- uses: actions/checkout@v5
294+
- uses: actions/checkout@v6
295295
- uses: actions/setup-python@v6
296296
- name: Set up dependencies
297297
shell: pwsh
298298
run: pip install meson ninja
299299
- name: Download build artifacts
300-
uses: actions/download-artifact@v6
300+
uses: actions/download-artifact@v8
301301
with:
302302
name: windows-meson-artifacts
303303
path: build
@@ -310,7 +310,7 @@ jobs:
310310
run: ci/print-test-failures.sh
311311
- name: Upload failed tests' directories
312312
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
313-
uses: actions/upload-artifact@v4
313+
uses: actions/upload-artifact@v7
314314
with:
315315
name: failed-tests-windows-meson-${{ matrix.nr }}
316316
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -346,15 +346,15 @@ jobs:
346346
TEST_OUTPUT_DIRECTORY: ${{github.workspace}}/t
347347
runs-on: ${{matrix.vector.pool}}
348348
steps:
349-
- uses: actions/checkout@v5
349+
- uses: actions/checkout@v6
350350
- run: ci/install-dependencies.sh
351351
- run: ci/run-build-and-tests.sh
352352
- name: print test failures
353353
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
354354
run: ci/print-test-failures.sh
355355
- name: Upload failed tests' directories
356356
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
357-
uses: actions/upload-artifact@v5
357+
uses: actions/upload-artifact@v7
358358
with:
359359
name: failed-tests-${{matrix.vector.jobname}}
360360
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -367,7 +367,7 @@ jobs:
367367
CI_JOB_IMAGE: ubuntu-latest
368368
runs-on: ubuntu-latest
369369
steps:
370-
- uses: actions/checkout@v5
370+
- uses: actions/checkout@v6
371371
- run: ci/install-dependencies.sh
372372
- run: ci/run-build-and-minimal-fuzzers.sh
373373
dockerized:
@@ -446,7 +446,7 @@ jobs:
446446
else
447447
apt-get -q update && apt-get -q -y install git
448448
fi
449-
- uses: actions/checkout@v5
449+
- uses: actions/checkout@v6
450450
- run: ci/install-dependencies.sh
451451
- run: useradd builder --create-home
452452
- run: chown -R builder .
@@ -456,7 +456,7 @@ jobs:
456456
run: sudo --preserve-env --set-home --user=builder ci/print-test-failures.sh
457457
- name: Upload failed tests' directories
458458
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
459-
uses: actions/upload-artifact@v5
459+
uses: actions/upload-artifact@v7
460460
with:
461461
name: failed-tests-${{matrix.vector.jobname}}
462462
path: ${{env.FAILED_TEST_ARTIFACTS}}
@@ -471,7 +471,7 @@ jobs:
471471
group: static-analysis-${{ github.ref }}
472472
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
473473
steps:
474-
- uses: actions/checkout@v5
474+
- uses: actions/checkout@v6
475475
- run: ci/install-dependencies.sh
476476
- run: ci/run-static-analysis.sh
477477
- run: ci/check-directional-formatting.bash
@@ -487,7 +487,7 @@ jobs:
487487
group: rust-analysis-${{ github.ref }}
488488
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
489489
steps:
490-
- uses: actions/checkout@v5
490+
- uses: actions/checkout@v6
491491
- run: ci/install-dependencies.sh
492492
- run: ci/run-rust-checks.sh
493493
sparse:
@@ -501,7 +501,7 @@ jobs:
501501
group: sparse-${{ github.ref }}
502502
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
503503
steps:
504-
- uses: actions/checkout@v5
504+
- uses: actions/checkout@v6
505505
- name: Install other dependencies
506506
run: ci/install-dependencies.sh
507507
- run: make sparse
@@ -517,6 +517,6 @@ jobs:
517517
CI_JOB_IMAGE: ubuntu-latest
518518
runs-on: ubuntu-latest
519519
steps:
520-
- uses: actions/checkout@v5
520+
- uses: actions/checkout@v6
521521
- run: ci/install-dependencies.sh
522522
- run: ci/test-documentation.sh

0 commit comments

Comments
 (0)