diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-16 13:54:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-16 13:54:16 -0700 |
| commit | 03d96fc61df71fe577d1209f489d636952721d5a (patch) | |
| tree | 0e6d446f690f1f1af447a229acc3697bfb4bb370 | |
| parent | 4df6c120fe20110d531c468038c766fda2243d2c (diff) | |
| parent | 832d9f6d0b57c353d18cf145835659ab5ac0124c (diff) | |
Merge branch 'js/ci-github-update-ubuntu'
Adjust to the deprecation of use of Ubuntu 20.04 GitHub Actions CI.
* js/ci-github-update-ubuntu:
ci: upgrade `sparse` to supported build agents
| -rw-r--r-- | .github/workflows/main.yml | 13 | ||||
| -rwxr-xr-x | ci/install-dependencies.sh | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 37541f3d10..11959fce24 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -448,21 +448,12 @@ jobs: if: needs.ci-config.outputs.enabled == 'yes' env: jobname: sparse - CI_JOB_IMAGE: ubuntu-20.04 - runs-on: ubuntu-20.04 + CI_JOB_IMAGE: ubuntu-22.04 + runs-on: ubuntu-22.04 concurrency: group: sparse-${{ github.ref }} cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} steps: - - name: Download a current `sparse` package - # Ubuntu's `sparse` version is too old for us - uses: git-for-windows/get-azure-pipelines-artifact@v0 - with: - repository: git/git - definitionId: 10 - artifact: sparse-20.04 - - name: Install the current `sparse` package - run: sudo dpkg -i sparse-20.04/sparse_*.deb - uses: actions/checkout@v4 - name: Install other dependencies run: ci/install-dependencies.sh diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 0df74610d0..8700c0f292 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -119,7 +119,7 @@ StaticAnalysis) sparse) sudo apt-get -q update -q sudo apt-get -q -y install libssl-dev libcurl4-openssl-dev \ - libexpat-dev gettext zlib1g-dev + libexpat-dev gettext zlib1g-dev sparse ;; Documentation) sudo apt-get -q update |