mirror of
https://github.com/git/git.git
synced 2026-08-04 23:21:06 +00:00
Merge branch 'jk/ci-static-analysis-image-bump' into jch
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
This commit is contained in:
4
.github/workflows/main.yml
vendored
4
.github/workflows/main.yml
vendored
@@ -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' }}
|
||||
|
||||
@@ -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:
|
||||
|
||||
6
bloom.c
6
bloom.c
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user