From 03e8d14eee6b552303bc01c5816074b79f2ea219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ja=C3=ABl=20Champagne=20Gareau?= Date: Sun, 15 Mar 2026 18:40:08 -0400 Subject: [PATCH] fix failing CI and rename misleading workflow name (#2630) --- .github/workflows/ubuntu24-checkperf.yml | 2 +- .github/workflows/ubuntu24-noexcept.yml | 4 ++-- .github/workflows/ubuntu24-nothread.yml | 2 +- .github/workflows/ubuntu24-sani.yml | 4 ++-- include/simdjson/padded_string-inl.h | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ubuntu24-checkperf.yml b/.github/workflows/ubuntu24-checkperf.yml index d9e37b83e..e106a6070 100644 --- a/.github/workflows/ubuntu24-checkperf.yml +++ b/.github/workflows/ubuntu24-checkperf.yml @@ -1,4 +1,4 @@ -name: Performance check on Ubuntu 20.04 CI (GCC 9) +name: Performance check on Ubuntu 24.04 CI (GCC 13) on: push: diff --git a/.github/workflows/ubuntu24-noexcept.yml b/.github/workflows/ubuntu24-noexcept.yml index 16a05d4c7..1bf5c8a7f 100644 --- a/.github/workflows/ubuntu24-noexcept.yml +++ b/.github/workflows/ubuntu24-noexcept.yml @@ -1,4 +1,4 @@ -name: Ubuntu 20.04 CI (GCC 9) without exceptions +name: Ubuntu 24.04 CI (GCC 13) without exceptions on: [push, pull_request] @@ -24,7 +24,7 @@ jobs: cd .. && mkdir build && cd build && - cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. && + cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_GOOGLE_BENCHMARKS=ON -DSIMDJSON_EXCEPTIONS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH=destination .. && cmake --build . && ctest --output-on-failure -LE explicitonly -j && make install && diff --git a/.github/workflows/ubuntu24-nothread.yml b/.github/workflows/ubuntu24-nothread.yml index d567a6d8f..8a94419be 100644 --- a/.github/workflows/ubuntu24-nothread.yml +++ b/.github/workflows/ubuntu24-nothread.yml @@ -1,4 +1,4 @@ -name: Ubuntu 20.04 CI (GCC 9) Without Threads +name: Ubuntu 24.04 CI (GCC 13) Without Threads on: [push, pull_request] diff --git a/.github/workflows/ubuntu24-sani.yml b/.github/workflows/ubuntu24-sani.yml index e658a8bbb..06875de3e 100644 --- a/.github/workflows/ubuntu24-sani.yml +++ b/.github/workflows/ubuntu24-sani.yml @@ -1,9 +1,9 @@ -name: Ubuntu 20.04 CI (GCC 9) With Memory Sanitizer +name: Ubuntu 24.04 CI (GCC 13) With Memory Sanitizer on: [push, pull_request] jobs: - ubuntu-build-address-sanitizier: + ubuntu-build-address-sanitizer: if: >- ! contains(toJSON(github.event.commits.*.message), '[skip ci]') && ! contains(toJSON(github.event.commits.*.message), '[skip github]') diff --git a/include/simdjson/padded_string-inl.h b/include/simdjson/padded_string-inl.h index dd4371120..24de21e21 100644 --- a/include/simdjson/padded_string-inl.h +++ b/include/simdjson/padded_string-inl.h @@ -387,7 +387,7 @@ simdjson_inline padded_memory_map::padded_memory_map(const char *filename) noexc close(fd); return; // failed to get file size, data will be nullptr } - size = (size_t)st.st_size; + size = static_cast(st.st_size); size_t total_size = size + simdjson::SIMDJSON_PADDING; void *anon_map = mmap(NULL, total_size, PROT_READ, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); @@ -402,13 +402,13 @@ simdjson_inline padded_memory_map::padded_memory_map(const char *filename) noexc close(fd); return; // failed to mmap file, data will be nullptr } - data = (const char *)file_map; + data = static_cast(file_map); close(fd); // no longer needed after mapping } simdjson_inline padded_memory_map::~padded_memory_map() noexcept { if (data != nullptr) { - munmap((void *)data, size + simdjson::SIMDJSON_PADDING); + munmap(const_cast(data), size + simdjson::SIMDJSON_PADDING); } }