Skip to content

Commit 832d9f6

Browse files
dschogitster
authored andcommitted
ci: upgrade sparse to supported build agents
The `sparse` job still uses the `ubuntu-20.04` runner pool, but that pool is about to go away, so let's stop using it. There is no `sparse-22.04` artifact provided by the "Build sparse for Ubuntu" Azure Pipeline, but that is not necessary anyway because Ubuntu 22.04 has the `sparse` package: https://packages.ubuntu.com/jammy/sparse Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 683c54c commit 832d9f6

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -446,20 +446,11 @@ jobs:
446446
if: needs.ci-config.outputs.enabled == 'yes'
447447
env:
448448
jobname: sparse
449-
runs-on: ubuntu-20.04
449+
runs-on: ubuntu-22.04
450450
concurrency:
451451
group: sparse-${{ github.ref }}
452452
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
453453
steps:
454-
- name: Download a current `sparse` package
455-
# Ubuntu's `sparse` version is too old for us
456-
uses: git-for-windows/get-azure-pipelines-artifact@v0
457-
with:
458-
repository: git/git
459-
definitionId: 10
460-
artifact: sparse-20.04
461-
- name: Install the current `sparse` package
462-
run: sudo dpkg -i sparse-20.04/sparse_*.deb
463454
- uses: actions/checkout@v4
464455
- name: Install other dependencies
465456
run: ci/install-dependencies.sh

ci/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ StaticAnalysis)
119119
sparse)
120120
sudo apt-get -q update -q
121121
sudo apt-get -q -y install libssl-dev libcurl4-openssl-dev \
122-
libexpat-dev gettext zlib1g-dev
122+
libexpat-dev gettext zlib1g-dev sparse
123123
;;
124124
Documentation)
125125
sudo apt-get -q update

0 commit comments

Comments
 (0)