diff options
| author |  Jeff King <peff@peff.net> | 2021-07-26 14:22:27 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-07-26 15:20:51 -0700 |
| commit | 27f45ccf336d70e9078075eb963fb92541da8690 (patch) | |
| tree | d18ce711042f392dbe1dad55cd215478726aef72 | |
| parent | ci: run "apt-get update" before "apt-get install" (diff) | |
| download | tgif-27f45ccf336d70e9078075eb963fb92541da8690.tar.xz | |
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 <peff@peff.net>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | .github/workflows/main.yml | 6 | ||||
| -rwxr-xr-x | ci/install-dependencies.sh | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 01878884ae..224c46b6d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -366,11 +366,9 @@ jobs: artifact: sparse-20.04 - name: Install the current `sparse` package run: sudo dpkg -i sparse-20.04/sparse_*.deb - - name: Install other dependencies - run: | - sudo apt-get update -q && - sudo apt-get install -q -y libssl-dev libcurl4-openssl-dev libexpat-dev gettext zlib1g-dev - uses: actions/checkout@v2 + - name: Install other dependencies + run: ci/install-dependencies.sh - run: make sparse documentation: needs: ci-config diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 67852d0d37..5772081b6e 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -65,6 +65,11 @@ StaticAnalysis) sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \ libexpat-dev gettext make ;; +sparse) + sudo apt-get -q update -q + sudo apt-get -q -y install libssl-dev libcurl4-openssl-dev \ + libexpat-dev gettext zlib1g-dev + ;; Documentation) sudo apt-get -q update sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make |