Skip to content

Commit dcce2bd

Browse files
committed
Merge branch 'jc/maint-github-actions-update' into jc/github-actions-update
This contains an evil merge to tell the fuzz-smoke-test job to also use checkout@v4; the job has been added since the master track diverged from the maintenance track. * jc/maint-github-actions-update: GitHub Actions: update to github-script@v7 GitHub Actions: update to checkout@v4
2 parents 2a540e4 + c4ddbe0 commit dcce2bd

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.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@v3
22+
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
2525

.github/workflows/coverity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
COVERITY_LANGUAGE: cxx
3939
COVERITY_PLATFORM: overridden-below
4040
steps:
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242
- name: install minimal Git for Windows SDK
4343
if: contains(matrix.os, 'windows')
4444
uses: git-for-windows/setup-git-for-windows-sdk@v1

.github/workflows/main.yml

Lines changed: 10 additions & 10 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@v6
66+
uses: actions/github-script@v7
6767
if: steps.check-ref.outputs.enabled == 'yes'
6868
with:
6969
github-token: ${{secrets.GITHUB_TOKEN}}
@@ -112,7 +112,7 @@ jobs:
112112
group: windows-build-${{ github.ref }}
113113
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
114114
steps:
115-
- uses: actions/checkout@v3
115+
- uses: actions/checkout@v4
116116
- uses: git-for-windows/setup-git-for-windows-sdk@v1
117117
- name: build
118118
shell: bash
@@ -173,10 +173,10 @@ jobs:
173173
group: vs-build-${{ github.ref }}
174174
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
175175
steps:
176-
- uses: actions/checkout@v3
176+
- uses: actions/checkout@v4
177177
- uses: git-for-windows/setup-git-for-windows-sdk@v1
178178
- name: initialize vcpkg
179-
uses: actions/checkout@v3
179+
uses: actions/checkout@v4
180180
with:
181181
repository: 'microsoft/vcpkg'
182182
path: 'compat/vcbuild/vcpkg'
@@ -297,7 +297,7 @@ jobs:
297297
runs_on_pool: ${{matrix.vector.pool}}
298298
runs-on: ${{matrix.vector.pool}}
299299
steps:
300-
- uses: actions/checkout@v3
300+
- uses: actions/checkout@v4
301301
- run: ci/install-dependencies.sh
302302
- run: ci/run-build-and-tests.sh
303303
- name: print test failures
@@ -317,7 +317,7 @@ jobs:
317317
CC: clang
318318
runs-on: ubuntu-latest
319319
steps:
320-
- uses: actions/checkout@v3
320+
- uses: actions/checkout@v4
321321
- run: ci/install-dependencies.sh
322322
- run: ci/run-build-and-minimal-fuzzers.sh
323323
dockerized:
@@ -342,7 +342,7 @@ jobs:
342342
runs-on: ubuntu-latest
343343
container: ${{matrix.vector.image}}
344344
steps:
345-
- uses: actions/checkout@v3
345+
- uses: actions/checkout@v4
346346
if: matrix.vector.jobname != 'linux32'
347347
- uses: actions/checkout@v1
348348
if: matrix.vector.jobname == 'linux32'
@@ -373,7 +373,7 @@ jobs:
373373
group: static-analysis-${{ github.ref }}
374374
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
375375
steps:
376-
- uses: actions/checkout@v3
376+
- uses: actions/checkout@v4
377377
- run: ci/install-dependencies.sh
378378
- run: ci/run-static-analysis.sh
379379
- run: ci/check-directional-formatting.bash
@@ -396,7 +396,7 @@ jobs:
396396
artifact: sparse-20.04
397397
- name: Install the current `sparse` package
398398
run: sudo dpkg -i sparse-20.04/sparse_*.deb
399-
- uses: actions/checkout@v3
399+
- uses: actions/checkout@v4
400400
- name: Install other dependencies
401401
run: ci/install-dependencies.sh
402402
- run: make sparse
@@ -411,6 +411,6 @@ jobs:
411411
jobname: Documentation
412412
runs-on: ubuntu-latest
413413
steps:
414-
- uses: actions/checkout@v3
414+
- uses: actions/checkout@v4
415415
- run: ci/install-dependencies.sh
416416
- run: ci/test-documentation.sh

0 commit comments

Comments
 (0)