Re: [PATCH 2/2] ci: bump ubuntu image version for static-analysis job
Elijah Newren <[email protected]>
| Newsgroups | org.kernel.vger.git |
|---|---|
| Message-ID | <CABPp-BEURtn+yh_m=DX1dUe5CY5mzpdmzpqOeZdOQ14sKw43FQ@mail.gmail.com> |
On Sun, Jul 26, 2026 at 1:39 AM Jeff King <[email protected]> wrote: > > We recently ran into a case[1] where old versions of coccinelle ran very > slowly, but newer ones are fine. The version we use in GitHub's CI was > the old slow version, leading to timeouts of the static-analysis job. > > We get the old version because we ask for the ubuntu-22.04 image. That > has coccinelle 1.1.1, but the "fast" improvement is in coccinelle 1.3.0, > specifically their 58619b8fe (break up envs for e1 & e2, 2024-08-18). > > Bumping to ubuntu-25.10 would be enough to get that new version. But I > don't see any need to ask for a specific version at all. We originally > used a specific version because coccinelle wasn't available in ubuntu > 20.04, so we pinned to 18.04 in d051ed77ee (.github/workflows/main.yml: > run static-analysis on bionic, 2021-02-08). Later that got bumped in > ef46584831 (ci: update 'static-analysis' to Ubuntu 22.04, 2022-08-23) > when 18.04 support was dropped. > > It seems like the absence of coccinelle was a blip in 20.04, and we can > just stick with "latest" going forward. > > I tested the result on GitHub's CI. I bumped the matching line in the > GitLab definition, but didn't have a simple means of testing (but it's > such a trivial change nothing could go wrong, right?). > > [1] https://lore.kernel.org/git/[email protected]/ > > Signed-off-by: Jeff King <[email protected]> > --- > .github/workflows/main.yml | 4 ++-- > .gitlab-ci.yml | 2 +- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml > index 85cfedf5b0..205325eb33 100644 > --- a/.github/workflows/main.yml > +++ b/.github/workflows/main.yml > @@ -460,8 +460,8 @@ jobs: > if: needs.ci-config.outputs.enabled == 'yes' > env: > jobname: StaticAnalysis > - CI_JOB_IMAGE: ubuntu-22.04 > - runs-on: ubuntu-22.04 > + CI_JOB_IMAGE: ubuntu-latest > + runs-on: ubuntu-latest > concurrency: > group: static-analysis-${{ github.ref }} > cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} > diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml > index 1c4d04da9d..0242283c3c 100644 > --- a/.gitlab-ci.yml > +++ b/.gitlab-ci.yml > @@ -227,7 +227,7 @@ test:fuzz-smoke-tests: > - ./ci/run-build-and-minimal-fuzzers.sh > > static-analysis: > - image: ubuntu:22.04 > + image: ubuntu:latest > stage: analyze > needs: [ ] > variables: > -- > 2.55.0.742.gf2bff09aa6 Makes sense to me; looks good.