From: Junio C Hamano Date: Wed, 16 Apr 2025 20:54:16 +0000 (-0700) Subject: Merge branch 'js/ci-github-update-ubuntu' X-Git-Tag: v2.50.0-rc0~114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03d96fc61df71fe577d1209f489d636952721d5a;p=thirdparty%2Fgit.git 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 --- 03d96fc61df71fe577d1209f489d636952721d5a diff --cc .github/workflows/main.yml index 37541f3d10,1c8260ecb6..11959fce24 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@@ -448,8 -446,7 +448,8 @@@ 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' }}