From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Feb 2024 21:02:41 +0000 (-0800)
Subject: Merge branch 'jc/maint-github-actions-update' into jc/github-actions-update
X-Git-Tag: v2.44.0-rc1~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dcce2bda214ac4c838f4b85f2c550816df3a6ac9;p=thirdparty%2Fgit.git

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
---

dcce2bda214ac4c838f4b85f2c550816df3a6ac9
diff --cc .github/workflows/main.yml
index 4d97da57ec,c7b04a521b..bb857bdaf0
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -309,17 -309,6 +309,17 @@@ jobs
        with:
          name: failed-tests-${{matrix.vector.jobname}}
          path: ${{env.FAILED_TEST_ARTIFACTS}}
 +  fuzz-smoke-test:
 +    name: fuzz smoke test
 +    needs: ci-config
 +    if: needs.ci-config.outputs.enabled == 'yes'
 +    env:
 +      CC: clang
 +    runs-on: ubuntu-latest
 +    steps:
-     - uses: actions/checkout@v3
++    - uses: actions/checkout@v4
 +    - run: ci/install-dependencies.sh
 +    - run: ci/run-build-and-minimal-fuzzers.sh
    dockerized:
      name: ${{matrix.vector.jobname}} (${{matrix.vector.image}})
      needs: ci-config