Skip to content

Commit 27f45cc

Browse files
peffgitster
authored andcommitted
ci/install-dependencies: handle "sparse" job package installs
This just matches the style/location of the package installation for other jobs. There should be no functional change. I did flip the order of the options and command-name ("-y update" instead of "update -y") for consistency with other lines in the same file. Note also that we have to reorder the dependency install with the "checkout" action, so that we actually have the "ci" scripts available. Signed-off-by: Jeff King <[email protected]> Acked-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8231c84 commit 27f45cc

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,11 +366,9 @@ jobs:
366366
artifact: sparse-20.04
367367
- name: Install the current `sparse` package
368368
run: sudo dpkg -i sparse-20.04/sparse_*.deb
369-
- name: Install other dependencies
370-
run: |
371-
sudo apt-get update -q &&
372-
sudo apt-get install -q -y libssl-dev libcurl4-openssl-dev libexpat-dev gettext zlib1g-dev
373369
- uses: actions/checkout@v2
370+
- name: Install other dependencies
371+
run: ci/install-dependencies.sh
374372
- run: make sparse
375373
documentation:
376374
needs: ci-config

ci/install-dependencies.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ StaticAnalysis)
6565
sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
6666
libexpat-dev gettext make
6767
;;
68+
sparse)
69+
sudo apt-get -q update -q
70+
sudo apt-get -q -y install libssl-dev libcurl4-openssl-dev \
71+
libexpat-dev gettext zlib1g-dev
72+
;;
6873
Documentation)
6974
sudo apt-get -q update
7075
sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make

0 commit comments

Comments
 (0)