Message ID | YP72o/1Yg02BcDXw@coredump.intra.peff.net (mailing list archive) |
---|---|
State | Accepted |
Commit | 8231c841ff7f213a86aa1fa890ea213f2dc630be |
Headers | show |
Series | ci: run "apt-get update" before "apt-get install" | expand |
On Mon, Jul 26, 2021 at 01:53:40PM -0400, Jeff King wrote: > I guess this package setup could also be moved into ci/install-dependencies.sh, > but I don't think it really buys anything (the "apt-get update" line > would not even be shared, because the outermost layer is a big switch > statement on the jobname). OTOH, it looks like other one-off jobs are in > there (e.g., StaticAnalysis). > > Anyway, this is the minimal fixup. That would look like this on top. I don't have a strong feeling either way. -- >8 -- Subject: [PATCH] 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> --- .github/workflows/main.yml | 6 ++---- 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
Jeff King <peff@peff.net> writes: > On Wed, Jul 14, 2021 at 11:50:33AM +0000, Johannes Schindelin via GitGitGadget wrote: > >> + - name: Install other dependencies >> + run: | >> + sudo apt-get install -q -y libssl-dev libcurl4-openssl-dev libexpat-dev gettext zlib1g-dev > > My CI runs based on 'next' started failing today. I think we'd want this > on top (of js/ci-make-sparse): Makes sense. > -- >8 -- > Subject: [PATCH] ci: run "apt-get update" before "apt-get install" > > The "sparse" workflow runs "apt-get install" to pick up a few necessary > packages. But it needs to run "apt-get update" first, or it risks trying > to download an old package version that no longer exists. And in fact > this happens now, with output like: > > 2021-07-26T17:40:51.2551880Z E: Failed to fetch http://security.ubuntu.com/ubuntu/pool/main/c/curl/libcurl4-openssl-dev_7.68.0-1ubuntu2.5_amd64.deb 404 Not Found [IP: 52.147.219.192 80] > 2021-07-26T17:40:51.2554304Z E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing? > > Our other ci jobs don't suffer from this; they rely on scripts in ci/, > and ci/install-dependencies does the appropriate "apt-get update". > > Signed-off-by: Jeff King <peff@peff.net> > --- > I guess this package setup could also be moved into ci/install-dependencies.sh, > but I don't think it really buys anything (the "apt-get update" line > would not even be shared, because the outermost layer is a big switch > statement on the jobname). OTOH, it looks like other one-off jobs are in > there (e.g., StaticAnalysis). > > Anyway, this is the minimal fixup. > > .github/workflows/main.yml | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml > index 1b5c039207..01878884ae 100644 > --- a/.github/workflows/main.yml > +++ b/.github/workflows/main.yml > @@ -368,6 +368,7 @@ jobs: > 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 > - run: make sparse
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1b5c039207..01878884ae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -368,6 +368,7 @@ jobs: 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 - run: make sparse