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 positivemain
commit
2816039db0
|
|
@ -460,8 +460,8 @@ jobs:
|
||||||
if: needs.ci-config.outputs.enabled == 'yes'
|
if: needs.ci-config.outputs.enabled == 'yes'
|
||||||
env:
|
env:
|
||||||
jobname: StaticAnalysis
|
jobname: StaticAnalysis
|
||||||
CI_JOB_IMAGE: ubuntu-22.04
|
CI_JOB_IMAGE: ubuntu-latest
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-latest
|
||||||
concurrency:
|
concurrency:
|
||||||
group: static-analysis-${{ github.ref }}
|
group: static-analysis-${{ github.ref }}
|
||||||
cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }}
|
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
|
- ./ci/run-build-and-minimal-fuzzers.sh
|
||||||
|
|
||||||
static-analysis:
|
static-analysis:
|
||||||
image: ubuntu:22.04
|
image: ubuntu:latest
|
||||||
stage: analyze
|
stage: analyze
|
||||||
needs: [ ]
|
needs: [ ]
|
||||||
variables:
|
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,
|
uint32_t test_bloom_murmur3_seeded(uint32_t seed, const char *data, size_t len,
|
||||||
int version)
|
int version)
|
||||||
{
|
{
|
||||||
assert(version == 1 || version == 2);
|
|
||||||
|
|
||||||
if (version == 2)
|
if (version == 2)
|
||||||
return murmur3_seeded_v2(seed, data, len);
|
return murmur3_seeded_v2(seed, data, len);
|
||||||
else
|
else if (version == 1)
|
||||||
return murmur3_seeded_v1(seed, data, len);
|
return murmur3_seeded_v1(seed, data, len);
|
||||||
|
else
|
||||||
|
BUG("unexpected bloom version: %d", version);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue