From ad4aa65d9ba6e4a42312a67c4345e0388b1cdc2e Mon Sep 17 00:00:00 2001 From: msclock Date: Thu, 14 Mar 2024 13:43:22 +0800 Subject: [PATCH 1/4] ci: refine checks and pages deploy --- .github/workflows/cd.yml | 14 ++++++++++++-- .github/workflows/ci.yml | 7 ++----- .../workflows/cd.yml.jinja | 14 ++++++++++++-- .../workflows/ci.yml | 7 ++----- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index c37bad74..d83b16a4 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -17,6 +17,11 @@ concurrency: env: FORCE_COLOR: 3 +permissions: + contents: read + pages: write + id-token: write + jobs: pages: name: Deploy to GitHub Pages @@ -26,8 +31,13 @@ jobs: steps: - uses: actions/checkout@v4 with: - fetch-depth: 0 token: ${{ secrets.GITHUB_TOKEN }} + ref: ${{ github.head_ref }} + + - name: Configure git + run: | + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - name: Cache uses: actions/cache@v4 @@ -51,7 +61,7 @@ jobs: pip install -r docs/requirements.txt - name: Configure - run: cmake -S . --preset=x64-linux-gcc -DBUILD_TESTING=OFF -DCODE_COVERAGE=OFF + run: cmake -S . --preset=x64-linux-gcc -DUSE_SANITIZER=OFF -DBUILD_TESTING=OFF -DCODE_COVERAGE=OFF - name: Build Docs run: cmake --build out/build/x64-linux-gcc --target ss-cpp-docs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f258926..91061786 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,16 +87,13 @@ jobs: - {os: {name: ubuntu-latest, type: linux}, compiler: {name: gcc-11, type: gcc}} - {os: {name: ubuntu-latest, type: linux}, compiler: {name: llvm, type: llvm}} - {os: {name: ubuntu-latest, type: mingw-dynamic-linux}, compiler: {name: mingw, type: mingw}} - - {os: {name: ubuntu-latest, type: mingw-static-linux}, compiler: {name: mingw, type: mingw}} - {os: {name: macos-latest, type: osx}, compiler: {name: applellvm, type: llvm}} - {os: {name: macos-latest, type: osx}, compiler: {name: llvm, type: llvm}} # setup-cpp doesn't support mingw on macOS yet # - {os: {name: macos-latest, type: mingw-dynamic-darwin}, compiler: {name: mingw, type: mingw}} - # - {os: {name: macos-latest, type: mingw-static-darwin}, compiler: {name: mingw, type: mingw}} - {os: {name: windows-latest, type: windows}, compiler: {name: msvc, type: msvc}} - {os: {name: windows-latest, type: windows}, compiler: {name: llvm, type: llvm}} - {os: {name: windows-latest, type: mingw-dynamic-windows}, compiler: {name: mingw, type: mingw}} - - {os: {name: windows-latest, type: mingw-static-windows}, compiler: {name: mingw, type: mingw}} arch: - {name: x64, type: x64} vcpkg: @@ -167,8 +164,8 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} files: out/build/${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }}/code_coverage/coverage.xml - flags: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }} - name: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }}-coverage + flags: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.presets.compiler.type }}-${{ matrix.vcpkg }} + name: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.presets.compiler.type }}-${{ matrix.vcpkg }}-coverage pass: if: always() diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/cd.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/cd.yml.jinja index 281363e2..dd5f8b0c 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/cd.yml.jinja +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/cd.yml.jinja @@ -17,6 +17,11 @@ concurrency: env: FORCE_COLOR: 3 +permissions: + contents: read + pages: write + id-token: write + jobs: pages: name: Deploy to GitHub Pages @@ -26,8 +31,13 @@ jobs: steps: - uses: actions/checkout@v4 with: - fetch-depth: 0 token: {{ '${{ secrets.GITHUB_TOKEN }}' }} + ref: {{ '${{ github.head_ref }}' }} + + - name: Configure git + run: | + git config user.name "github-actions[bot]" + git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - name: Cache uses: actions/cache@v4 @@ -51,7 +61,7 @@ jobs: pip install -r docs/requirements.txt - name: Configure - run: cmake -S . --preset=x64-linux-gcc -DBUILD_TESTING=OFF -DCODE_COVERAGE=OFF + run: cmake -S . --preset=x64-linux-gcc -DUSE_SANITIZER=OFF -DBUILD_TESTING=OFF -DCODE_COVERAGE=OFF - name: Build Docs run: cmake --build out/build/x64-linux-gcc --target {{ repo_name }}-docs diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml index 2f258926..91061786 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml @@ -87,16 +87,13 @@ jobs: - {os: {name: ubuntu-latest, type: linux}, compiler: {name: gcc-11, type: gcc}} - {os: {name: ubuntu-latest, type: linux}, compiler: {name: llvm, type: llvm}} - {os: {name: ubuntu-latest, type: mingw-dynamic-linux}, compiler: {name: mingw, type: mingw}} - - {os: {name: ubuntu-latest, type: mingw-static-linux}, compiler: {name: mingw, type: mingw}} - {os: {name: macos-latest, type: osx}, compiler: {name: applellvm, type: llvm}} - {os: {name: macos-latest, type: osx}, compiler: {name: llvm, type: llvm}} # setup-cpp doesn't support mingw on macOS yet # - {os: {name: macos-latest, type: mingw-dynamic-darwin}, compiler: {name: mingw, type: mingw}} - # - {os: {name: macos-latest, type: mingw-static-darwin}, compiler: {name: mingw, type: mingw}} - {os: {name: windows-latest, type: windows}, compiler: {name: msvc, type: msvc}} - {os: {name: windows-latest, type: windows}, compiler: {name: llvm, type: llvm}} - {os: {name: windows-latest, type: mingw-dynamic-windows}, compiler: {name: mingw, type: mingw}} - - {os: {name: windows-latest, type: mingw-static-windows}, compiler: {name: mingw, type: mingw}} arch: - {name: x64, type: x64} vcpkg: @@ -167,8 +164,8 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} files: out/build/${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }}/code_coverage/coverage.xml - flags: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }} - name: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }}-coverage + flags: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.presets.compiler.type }}-${{ matrix.vcpkg }} + name: ${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.presets.compiler.type }}-${{ matrix.vcpkg }}-coverage pass: if: always() From bc88a4391726c139746c25336243678af4394625 Mon Sep 17 00:00:00 2001 From: msclock Date: Thu, 14 Mar 2024 14:42:46 +0800 Subject: [PATCH 2/4] ci: set correct restore-keys for actions/cache --- .github/workflows/ci.yml | 4 ++-- .../workflows/ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91061786..b823eb2f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,9 +114,9 @@ jobs: ~/.cache/vcpkg ~/AppData/Local/vcpkg key: | - ${{ matrix.arch.name }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.vcpkg }}-${{ hashFiles('./vcpkg.json') }} + ${{ matrix.arch.name }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ hashFiles('./vcpkg.json') }}-${{ matrix.vcpkg }} restore-keys: | - ${{ matrix.arch.name }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.vcpkg }}-${{ hashFiles('./vcpkg.json') }} + ${{ matrix.arch.name }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ hashFiles('./vcpkg.json') }}- - uses: aminya/setup-cpp@v1 with: diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml index 91061786..b823eb2f 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml @@ -114,9 +114,9 @@ jobs: ~/.cache/vcpkg ~/AppData/Local/vcpkg key: | - ${{ matrix.arch.name }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.vcpkg }}-${{ hashFiles('./vcpkg.json') }} + ${{ matrix.arch.name }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ hashFiles('./vcpkg.json') }}-${{ matrix.vcpkg }} restore-keys: | - ${{ matrix.arch.name }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ matrix.vcpkg }}-${{ hashFiles('./vcpkg.json') }} + ${{ matrix.arch.name }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.name }}-${{ hashFiles('./vcpkg.json') }}- - uses: aminya/setup-cpp@v1 with: From c0286b8634cc199344e09e8ddf327006320c7462 Mon Sep 17 00:00:00 2001 From: msclock Date: Thu, 14 Mar 2024 17:38:09 +0800 Subject: [PATCH 3/4] ci: time-out with 15 mins --- .github/workflows/ci.yml | 1 + .../workflows/ci.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b823eb2f..8eca3aba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,6 +76,7 @@ jobs: checks: runs-on: ${{ matrix.presets.os.name }} + timeout-minutes: 15 permissions: actions: read contents: read diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml index b823eb2f..8eca3aba 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml @@ -76,6 +76,7 @@ jobs: checks: runs-on: ${{ matrix.presets.os.name }} + timeout-minutes: 15 permissions: actions: read contents: read From e6ec11e35a02d40a7542829a8b79ca7f018c8a5a Mon Sep 17 00:00:00 2001 From: msclock Date: Thu, 14 Mar 2024 18:03:57 +0800 Subject: [PATCH 4/4] build: triplet preset disable sanitizer for mingw-w64 --- .github/workflows/ci.yml | 12 ++++++++---- cmake/presets/triplets/x64-mingw-dynamic.json | 3 ++- cmake/presets/triplets/x64-mingw-static.json | 3 ++- cmake/presets/x64-mingw-dynamic-linux-mingw.json | 5 +---- cmake/presets/x64-mingw-dynamic-windows-mingw.json | 6 ++---- cmake/presets/x64-mingw-static-linux-mingw.json | 5 +---- cmake/presets/x64-mingw-static-windows-mingw.json | 5 +---- cmake/presets/x64-windows-llvm.json | 2 +- .../workflows/ci.yml | 12 ++++++++---- .../cmake/presets/triplets/x64-mingw-dynamic.json | 3 ++- .../cmake/presets/triplets/x64-mingw-static.json | 3 ++- .../cmake/presets/x64-mingw-dynamic-linux-mingw.json | 5 +---- .../presets/x64-mingw-dynamic-windows-mingw.json | 6 ++---- .../cmake/presets/x64-mingw-static-linux-mingw.json | 5 +---- .../presets/x64-mingw-static-windows-mingw.json | 5 +---- template/cmake/presets/x64-windows-llvm.json | 2 +- 16 files changed, 36 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8eca3aba..fb367986 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -128,15 +128,15 @@ jobs: vcpkg: ${{ matrix.vcpkg }} ccache: true python: true - opencppcoverage: true + opencppcoverage: ${{ contains(matrix.presets.os.type, 'windows' )}} - - name: Gcc Lcov + - name: Lcov for coverage if: contains(matrix.presets.compiler.type, 'gcc') && contains(matrix.presets.os.type, 'linux') run: | sudo apt-get update sudo apt-get install lcov - - name: Gcovr + - name: Gcovr for coverage if: contains(matrix.presets.compiler.type, 'mingw') && contains(matrix.presets.os.type, 'mingw') run: | pip install gcovr @@ -154,7 +154,11 @@ jobs: - name: Configure CMake run: | - cmake -S . --preset=${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }} -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON -DBUILD_TESTING=ON -DCMAKE_VERBOSE_MAKEFILE=TRUE + cmake -S . --preset=${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }} -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON -DBUILD_TESTING=ON ${{ matrix.presets.os.type == 'linux' && '-DUSE_SANITIZER=OFF' || '' }} + + - name: Build + run: | + cmake --build out/build/${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }} --target all - name: Coverage run: | diff --git a/cmake/presets/triplets/x64-mingw-dynamic.json b/cmake/presets/triplets/x64-mingw-dynamic.json index 849b15f7..e11e299f 100644 --- a/cmake/presets/triplets/x64-mingw-dynamic.json +++ b/cmake/presets/triplets/x64-mingw-dynamic.json @@ -12,7 +12,8 @@ ], "cacheVariables": { "VCPKG_TARGET_TRIPLET": "x64-mingw-dynamic", - "VCPKG_HOST_TRIPLET": "x64-mingw-dynamic" + "VCPKG_HOST_TRIPLET": "x64-mingw-dynamic", + "USE_SANITIZER": "OFF" } } ] diff --git a/cmake/presets/triplets/x64-mingw-static.json b/cmake/presets/triplets/x64-mingw-static.json index 1caf05bd..5ac580f7 100644 --- a/cmake/presets/triplets/x64-mingw-static.json +++ b/cmake/presets/triplets/x64-mingw-static.json @@ -12,7 +12,8 @@ ], "cacheVariables": { "VCPKG_TARGET_TRIPLET": "x64-mingw-static", - "VCPKG_HOST_TRIPLET": "x64-mingw-static" + "VCPKG_HOST_TRIPLET": "x64-mingw-static", + "USE_SANITIZER": "OFF" } } ] diff --git a/cmake/presets/x64-mingw-dynamic-linux-mingw.json b/cmake/presets/x64-mingw-dynamic-linux-mingw.json index 4905059b..0c919569 100644 --- a/cmake/presets/x64-mingw-dynamic-linux-mingw.json +++ b/cmake/presets/x64-mingw-dynamic-linux-mingw.json @@ -14,10 +14,7 @@ "linux", "mingw", "x64-mingw-dynamic" - ], - "cacheVariables": { - "USE_SANITIZER": "FALSE" - } + ] } ], "buildPresets": [ diff --git a/cmake/presets/x64-mingw-dynamic-windows-mingw.json b/cmake/presets/x64-mingw-dynamic-windows-mingw.json index 0d9c996a..bae53dc3 100644 --- a/cmake/presets/x64-mingw-dynamic-windows-mingw.json +++ b/cmake/presets/x64-mingw-dynamic-windows-mingw.json @@ -14,10 +14,8 @@ "windows", "mingw", "x64-mingw-dynamic" - ], - "cacheVariables": { - "USE_SANITIZER": "FALSE" - } + ] + } ], "buildPresets": [ diff --git a/cmake/presets/x64-mingw-static-linux-mingw.json b/cmake/presets/x64-mingw-static-linux-mingw.json index 15355f53..6297c9da 100644 --- a/cmake/presets/x64-mingw-static-linux-mingw.json +++ b/cmake/presets/x64-mingw-static-linux-mingw.json @@ -14,10 +14,7 @@ "linux", "mingw", "x64-mingw-static" - ], - "cacheVariables": { - "USE_SANITIZER": "FALSE" - } + ] } ], "buildPresets": [ diff --git a/cmake/presets/x64-mingw-static-windows-mingw.json b/cmake/presets/x64-mingw-static-windows-mingw.json index 5eb63e2d..31a6f44b 100644 --- a/cmake/presets/x64-mingw-static-windows-mingw.json +++ b/cmake/presets/x64-mingw-static-windows-mingw.json @@ -14,10 +14,7 @@ "windows", "mingw", "x64-mingw-static" - ], - "cacheVariables": { - "USE_SANITIZER": "FALSE" - } + ] } ], "buildPresets": [ diff --git a/cmake/presets/x64-windows-llvm.json b/cmake/presets/x64-windows-llvm.json index fdcf92f9..04acc624 100644 --- a/cmake/presets/x64-windows-llvm.json +++ b/cmake/presets/x64-windows-llvm.json @@ -16,7 +16,7 @@ "x64-windows" ], "cacheVariables": { - "USE_SANITIZER": "FALSE" + "USE_SANITIZER": "OFF" } } ], diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml index 8eca3aba..fb367986 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml @@ -128,15 +128,15 @@ jobs: vcpkg: ${{ matrix.vcpkg }} ccache: true python: true - opencppcoverage: true + opencppcoverage: ${{ contains(matrix.presets.os.type, 'windows' )}} - - name: Gcc Lcov + - name: Lcov for coverage if: contains(matrix.presets.compiler.type, 'gcc') && contains(matrix.presets.os.type, 'linux') run: | sudo apt-get update sudo apt-get install lcov - - name: Gcovr + - name: Gcovr for coverage if: contains(matrix.presets.compiler.type, 'mingw') && contains(matrix.presets.os.type, 'mingw') run: | pip install gcovr @@ -154,7 +154,11 @@ jobs: - name: Configure CMake run: | - cmake -S . --preset=${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }} -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON -DBUILD_TESTING=ON -DCMAKE_VERBOSE_MAKEFILE=TRUE + cmake -S . --preset=${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }} -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON -DBUILD_TESTING=ON ${{ matrix.presets.os.type == 'linux' && '-DUSE_SANITIZER=OFF' || '' }} + + - name: Build + run: | + cmake --build out/build/${{ matrix.arch.type }}-${{ matrix.presets.os.type }}-${{ matrix.presets.compiler.type }} --target all - name: Coverage run: | diff --git a/template/cmake/presets/triplets/x64-mingw-dynamic.json b/template/cmake/presets/triplets/x64-mingw-dynamic.json index 849b15f7..e11e299f 100644 --- a/template/cmake/presets/triplets/x64-mingw-dynamic.json +++ b/template/cmake/presets/triplets/x64-mingw-dynamic.json @@ -12,7 +12,8 @@ ], "cacheVariables": { "VCPKG_TARGET_TRIPLET": "x64-mingw-dynamic", - "VCPKG_HOST_TRIPLET": "x64-mingw-dynamic" + "VCPKG_HOST_TRIPLET": "x64-mingw-dynamic", + "USE_SANITIZER": "OFF" } } ] diff --git a/template/cmake/presets/triplets/x64-mingw-static.json b/template/cmake/presets/triplets/x64-mingw-static.json index 1caf05bd..5ac580f7 100644 --- a/template/cmake/presets/triplets/x64-mingw-static.json +++ b/template/cmake/presets/triplets/x64-mingw-static.json @@ -12,7 +12,8 @@ ], "cacheVariables": { "VCPKG_TARGET_TRIPLET": "x64-mingw-static", - "VCPKG_HOST_TRIPLET": "x64-mingw-static" + "VCPKG_HOST_TRIPLET": "x64-mingw-static", + "USE_SANITIZER": "OFF" } } ] diff --git a/template/cmake/presets/x64-mingw-dynamic-linux-mingw.json b/template/cmake/presets/x64-mingw-dynamic-linux-mingw.json index 4905059b..0c919569 100644 --- a/template/cmake/presets/x64-mingw-dynamic-linux-mingw.json +++ b/template/cmake/presets/x64-mingw-dynamic-linux-mingw.json @@ -14,10 +14,7 @@ "linux", "mingw", "x64-mingw-dynamic" - ], - "cacheVariables": { - "USE_SANITIZER": "FALSE" - } + ] } ], "buildPresets": [ diff --git a/template/cmake/presets/x64-mingw-dynamic-windows-mingw.json b/template/cmake/presets/x64-mingw-dynamic-windows-mingw.json index 0d9c996a..bae53dc3 100644 --- a/template/cmake/presets/x64-mingw-dynamic-windows-mingw.json +++ b/template/cmake/presets/x64-mingw-dynamic-windows-mingw.json @@ -14,10 +14,8 @@ "windows", "mingw", "x64-mingw-dynamic" - ], - "cacheVariables": { - "USE_SANITIZER": "FALSE" - } + ] + } ], "buildPresets": [ diff --git a/template/cmake/presets/x64-mingw-static-linux-mingw.json b/template/cmake/presets/x64-mingw-static-linux-mingw.json index 15355f53..6297c9da 100644 --- a/template/cmake/presets/x64-mingw-static-linux-mingw.json +++ b/template/cmake/presets/x64-mingw-static-linux-mingw.json @@ -14,10 +14,7 @@ "linux", "mingw", "x64-mingw-static" - ], - "cacheVariables": { - "USE_SANITIZER": "FALSE" - } + ] } ], "buildPresets": [ diff --git a/template/cmake/presets/x64-mingw-static-windows-mingw.json b/template/cmake/presets/x64-mingw-static-windows-mingw.json index 5eb63e2d..31a6f44b 100644 --- a/template/cmake/presets/x64-mingw-static-windows-mingw.json +++ b/template/cmake/presets/x64-mingw-static-windows-mingw.json @@ -14,10 +14,7 @@ "windows", "mingw", "x64-mingw-static" - ], - "cacheVariables": { - "USE_SANITIZER": "FALSE" - } + ] } ], "buildPresets": [ diff --git a/template/cmake/presets/x64-windows-llvm.json b/template/cmake/presets/x64-windows-llvm.json index fdcf92f9..04acc624 100644 --- a/template/cmake/presets/x64-windows-llvm.json +++ b/template/cmake/presets/x64-windows-llvm.json @@ -16,7 +16,7 @@ "x64-windows" ], "cacheVariables": { - "USE_SANITIZER": "FALSE" + "USE_SANITIZER": "OFF" } } ],