diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-08-05 11:10:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-08-05 11:10:51 -0700 |
| commit | 2816039db09eb8044673cb07ca4dfdca83bff399 (patch) | |
| tree | 280a4c17b04978bcacf9426122d31036ae246a66 | |
| parent | 67b1d2fa4304b27fed49a356098db13ba94741fb (diff) | |
| parent | 1a1579c42d9d4c78d4d4df5e4d3d8bc73e3ddf9b (diff) | |
Merge branch 'jk/ci-static-analysis-image-bump'
The image version used by the static-analysis CI job has been bumped
to ubuntu-latest (Ubuntu 24.04), which brings in a newer Coccinelle
version that resolves a severe performance regression. A false
positive warning from the 'CHECK_ASSERTION_SIDE_EFFECTS' build with
GCC 15 in the Bloom filter code has also been silenced to facilitate
the image upgrade.
* jk/ci-static-analysis-image-bump:
ci: bump ubuntu image version for static-analysis job
bloom: silence CHECK_ASSERTION_SIDE_EFFECTS false positive
| -rw-r--r-- | .github/workflows/main.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | bloom.c | 6 |
3 files changed, 6 insertions, 6 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: @@ -610,10 +610,10 @@ int bloom_filter_contains_vec(const struct bloom_filter *filter, uint32_t test_bloom_murmur3_seeded(uint32_t seed, const char *data, size_t len, int version) { - assert(version == 1 || version == 2); - if (version == 2) return murmur3_seeded_v2(seed, data, len); - else + else if (version == 1) return murmur3_seeded_v1(seed, data, len); + else + BUG("unexpected bloom version: %d", version); } |