mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-github-actions-update'

Browse Source 
* jc/maint-github-actions-update:
  GitHub Actions: update to github-script@v7
  GitHub Actions: update to checkout@v4

Yet another thing to help `maint-2.39`'s CI builds to become healthy
again.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2024-04-10 19:25:03 +02:00
parent 6133e3a77e f6bed64ce2
commit 64f35baa34
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/check-whitespace.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
check-whitespace: check-whitespace:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0

18
.github/workflows/main.yml vendored
View File

@ -46,7 +46,7 @@ jobs:
echo "skip_concurrent=$skip_concurrent" >>$GITHUB_OUTPUT echo "skip_concurrent=$skip_concurrent" >>$GITHUB_OUTPUT
- name: skip if the commit or tree was already tested - name: skip if the commit or tree was already tested
id: skip-if-redundant id: skip-if-redundant
uses: actions/github-script@v6 uses: actions/github-script@v7
if: steps.check-ref.outputs.enabled == 'yes' if: steps.check-ref.outputs.enabled == 'yes'
with: with:
github-token: ${{secrets.GITHUB_TOKEN}} github-token: ${{secrets.GITHUB_TOKEN}}
@ -95,7 +95,7 @@ jobs:
group: windows-build-${{ github.ref }} group: windows-build-${{ github.ref }}
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: git-for-windows/setup-git-for-windows-sdk@v1 - uses: git-for-windows/setup-git-for-windows-sdk@v1
- name: build - name: build
shell: bash shell: bash
@ -156,10 +156,10 @@ jobs:
group: vs-build-${{ github.ref }} group: vs-build-${{ github.ref }}
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- uses: git-for-windows/setup-git-for-windows-sdk@v1 - uses: git-for-windows/setup-git-for-windows-sdk@v1
- name: initialize vcpkg - name: initialize vcpkg
uses: actions/checkout@v3 uses: actions/checkout@v4
with: with:
repository: 'microsoft/vcpkg' repository: 'microsoft/vcpkg'
path: 'compat/vcbuild/vcpkg' path: 'compat/vcbuild/vcpkg'
@ -286,7 +286,7 @@ jobs:
runs_on_pool: ${{matrix.vector.pool}} runs_on_pool: ${{matrix.vector.pool}}
runs-on: ${{matrix.vector.pool}} runs-on: ${{matrix.vector.pool}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- run: ci/install-dependencies.sh - run: ci/install-dependencies.sh
- run: ci/run-build-and-tests.sh - run: ci/run-build-and-tests.sh
- run: ci/print-test-failures.sh - run: ci/print-test-failures.sh
@ -319,7 +319,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: ${{matrix.vector.image}} container: ${{matrix.vector.image}}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
if: matrix.vector.jobname != 'linux32' if: matrix.vector.jobname != 'linux32'
- uses: actions/checkout@v1 - uses: actions/checkout@v1
if: matrix.vector.jobname == 'linux32' if: matrix.vector.jobname == 'linux32'
@ -349,7 +349,7 @@ jobs:
group: static-analysis-${{ github.ref }} group: static-analysis-${{ github.ref }}
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- run: ci/install-dependencies.sh - run: ci/install-dependencies.sh
- run: ci/run-static-analysis.sh - run: ci/run-static-analysis.sh
- run: ci/check-directional-formatting.bash - run: ci/check-directional-formatting.bash
@ -372,7 +372,7 @@ jobs:
artifact: sparse-20.04 artifact: sparse-20.04
- name: Install the current `sparse` package - name: Install the current `sparse` package
run: sudo dpkg -i sparse-20.04/sparse_*.deb run: sudo dpkg -i sparse-20.04/sparse_*.deb
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- name: Install other dependencies - name: Install other dependencies
run: ci/install-dependencies.sh run: ci/install-dependencies.sh
- run: make sparse - run: make sparse
@ -387,6 +387,6 @@ jobs:
jobname: Documentation jobname: Documentation
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v4
- run: ci/install-dependencies.sh - run: ci/install-dependencies.sh
- run: ci/test-documentation.sh - run: ci/test-documentation.sh