From b115e3ef61e2810d9b53139a144608d7e8caee64 Mon Sep 17 00:00:00 2001 From: Daniel Lemire Date: Sun, 17 Mar 2024 11:59:50 -0400 Subject: [PATCH] some updates to our CI (#2151) --- .github/workflows/alpine.yml | 2 +- .github/workflows/fuzzers.yml | 6 +++--- .github/workflows/macos.yml | 2 +- .github/workflows/msys2-clang.yml | 2 +- .github/workflows/msys2.yml | 2 +- .github/workflows/ubuntu20-checkperf.yml | 2 +- .github/workflows/ubuntu20-gcc8.yml | 2 +- .github/workflows/ubuntu20-noexcept.yml | 2 +- .github/workflows/ubuntu20-nothread.yml | 2 +- .github/workflows/ubuntu20-sani.yml | 4 ++-- .github/workflows/ubuntu20.yml | 2 +- .github/workflows/ubuntu22-clang13.yml | 2 +- .github/workflows/ubuntu22-clang14.yml | 2 +- .github/workflows/ubuntu22-cxx20.yml | 2 +- .github/workflows/ubuntu22-gcc12.yml | 2 +- .github/workflows/ubuntu22-gcc13.yml | 2 +- .github/workflows/ubuntu22-glibcxxassertions.yml | 2 +- .github/workflows/ubuntu22-threadsani.yml | 6 +++--- .github/workflows/ubuntu22.yml | 2 +- .github/workflows/vs17-noexcept-ci.yml | 2 +- 20 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml index 1fd8226ac..d44adaf63 100644 --- a/.github/workflows/alpine.yml +++ b/.github/workflows/alpine.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/fuzzers.yml b/.github/workflows/fuzzers.yml index fb668624d..5f50abf5e 100644 --- a/.github/workflows/fuzzers.yml +++ b/.github/workflows/fuzzers.yml @@ -34,18 +34,18 @@ jobs: sudo apt update sudo apt-get install --quiet ninja-build valgrind zip unzip lsb-release wget software-properties-common gnupg wget https://apt.llvm.org/llvm.sh - sudo apt-get purge --auto-remove llvm python3-lldb-14 llvm-14 + sudo apt-get purge --auto-remove llvm python3-lldb-15 llvm-15 chmod +x llvm.sh sudo ./llvm.sh $CLANGVERSION - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: cache-corpus with: path: out/ diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 0c6ea34fd..1eda9ebe7 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -10,7 +10,7 @@ jobs: runs-on: macos-latest steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/msys2-clang.yml b/.github/workflows/msys2-clang.yml index b7f8b2c8d..d483d91c1 100644 --- a/.github/workflows/msys2-clang.yml +++ b/.github/workflows/msys2-clang.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 362fb516e..1c6d0e614 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -27,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu20-checkperf.yml b/.github/workflows/ubuntu20-checkperf.yml index 27a17faf6..742600575 100644 --- a/.github/workflows/ubuntu20-checkperf.yml +++ b/.github/workflows/ubuntu20-checkperf.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu20-gcc8.yml b/.github/workflows/ubuntu20-gcc8.yml index bee87c41f..64b0a3834 100644 --- a/.github/workflows/ubuntu20-gcc8.yml +++ b/.github/workflows/ubuntu20-gcc8.yml @@ -13,7 +13,7 @@ jobs: CC: gcc-8 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu20-noexcept.yml b/.github/workflows/ubuntu20-noexcept.yml index 2e5cc053c..4efc50c74 100644 --- a/.github/workflows/ubuntu20-noexcept.yml +++ b/.github/workflows/ubuntu20-noexcept.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu20-nothread.yml b/.github/workflows/ubuntu20-nothread.yml index a06bc0cdd..fe3ea9444 100644 --- a/.github/workflows/ubuntu20-nothread.yml +++ b/.github/workflows/ubuntu20-nothread.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu20-sani.yml b/.github/workflows/ubuntu20-sani.yml index d95ab96c5..2eec17dba 100644 --- a/.github/workflows/ubuntu20-sani.yml +++ b/.github/workflows/ubuntu20-sani.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu20.yml b/.github/workflows/ubuntu20.yml index 513bd071a..bae1788fd 100644 --- a/.github/workflows/ubuntu20.yml +++ b/.github/workflows/ubuntu20.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu22-clang13.yml b/.github/workflows/ubuntu22-clang13.yml index af34140a9..780cabef2 100644 --- a/.github/workflows/ubuntu22-clang13.yml +++ b/.github/workflows/ubuntu22-clang13.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu22-clang14.yml b/.github/workflows/ubuntu22-clang14.yml index 36cb61379..cd2497e1b 100644 --- a/.github/workflows/ubuntu22-clang14.yml +++ b/.github/workflows/ubuntu22-clang14.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu22-cxx20.yml b/.github/workflows/ubuntu22-cxx20.yml index 7ac808bc5..ac674769a 100644 --- a/.github/workflows/ubuntu22-cxx20.yml +++ b/.github/workflows/ubuntu22-cxx20.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu22-gcc12.yml b/.github/workflows/ubuntu22-gcc12.yml index 0e44a8e70..18d4c2000 100644 --- a/.github/workflows/ubuntu22-gcc12.yml +++ b/.github/workflows/ubuntu22-gcc12.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu22-gcc13.yml b/.github/workflows/ubuntu22-gcc13.yml index 2959547af..c9f9b264b 100644 --- a/.github/workflows/ubuntu22-gcc13.yml +++ b/.github/workflows/ubuntu22-gcc13.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu22-glibcxxassertions.yml b/.github/workflows/ubuntu22-glibcxxassertions.yml index 5065a6d2a..94d9642c9 100644 --- a/.github/workflows/ubuntu22-glibcxxassertions.yml +++ b/.github/workflows/ubuntu22-glibcxxassertions.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/ubuntu22-threadsani.yml b/.github/workflows/ubuntu22-threadsani.yml index 531690103..563712f59 100644 --- a/.github/workflows/ubuntu22-threadsani.yml +++ b/.github/workflows/ubuntu22-threadsani.yml @@ -1,4 +1,4 @@ -name: Ubuntu 22.04 CI (GCC 11) with Thread Sanitizer +name: Ubuntu 22.04 CI (GCC 12) with Thread Sanitizer on: [push, pull_request] @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} @@ -18,7 +18,7 @@ jobs: run: | mkdir build && cd build && - cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON .. && + CXX=g++-12 cmake -DSIMDJSON_DEVELOPER_MODE=ON -DSIMDJSON_SANITIZE_THREADS=ON .. && cmake --build . --target document_stream_tests --target ondemand_document_stream_tests --target parse_many_test && ctest --output-on-failure -R parse_many_test && ctest --output-on-failure -R document_stream_tests \ No newline at end of file diff --git a/.github/workflows/ubuntu22.yml b/.github/workflows/ubuntu22.yml index e2f36bf36..477ffb99e 100644 --- a/.github/workflows/ubuntu22.yml +++ b/.github/workflows/ubuntu22.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }} diff --git a/.github/workflows/vs17-noexcept-ci.yml b/.github/workflows/vs17-noexcept-ci.yml index cce0ef1c2..4e925e672 100644 --- a/.github/workflows/vs17-noexcept-ci.yml +++ b/.github/workflows/vs17-noexcept-ci.yml @@ -8,7 +8,7 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v4 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: dependencies/.cache key: ${{ hashFiles('dependencies/CMakeLists.txt') }}