diff --git a/.github/workflows/darwin.yml b/.github/workflows/darwin.yml index 9164866..cf9f811 100644 --- a/.github/workflows/darwin.yml +++ b/.github/workflows/darwin.yml @@ -18,6 +18,8 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive + - name: Install ninja by Homebrew + run: brew install ninja - name: Select Xcode run: sudo xcode-select --switch "/Applications/Xcode_${{matrix.config.xcode}}.app" - name: Build && Test diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 45d65c8..f5a8569 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -10,11 +10,11 @@ jobs: matrix: config: # https://github.com/actions/virtual-environments/tree/main/images/win - - { os: "windows-2019", vs: "msvc2019", arch: "x86" } - - { os: "windows-2019", vs: "msvc2019", arch: "x64" } - - { os: "windows-2022", vs: "msvc2022", arch: "x86" } - - { os: "windows-2022", vs: "msvc2022", arch: "x64" } - name: "${{matrix.config.vs}} ${{matrix.config.arch}}" + - { os: "windows-2019", vc: "msvc2019", arch: "x86" } + - { os: "windows-2019", vc: "msvc2019", arch: "x64" } + - { os: "windows-2022", vc: "msvc2022", arch: "x86" } + - { os: "windows-2022", vc: "msvc2022", arch: "x64" } + name: "${{matrix.config.vc}} ${{matrix.config.arch}}" steps: - uses: actions/checkout@v2 with: diff --git a/CMakePresets.json b/CMakePresets.json index 64be4f6..cf01395 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -29,7 +29,7 @@ } }, { - "name": "linux-clang10", + "name": "linux-clang-10", "inherits": "linux-base", "cacheVariables": { "CMAKE_C_COMPILER": "clang-10", @@ -37,7 +37,7 @@ } }, { - "name": "linux-gcc10", + "name": "linux-gcc-10", "inherits": "linux-base", "cacheVariables": { "CMAKE_C_COMPILER": "gcc-10", @@ -162,24 +162,24 @@ "buildPresets": [ { - "name": "linux-clang10-debug", + "name": "linux-clang-10-debug", "configuration": "Debug", - "configurePreset": "linux-clang10" + "configurePreset": "linux-clang-10" }, { - "name": "linux-clang10-release", + "name": "linux-clang-10-release", "configuration": "Release", - "configurePreset": "linux-clang10" + "configurePreset": "linux-clang-10" }, { - "name": "linux-gcc10-debug", + "name": "linux-gcc-10-debug", "configuration": "Debug", - "configurePreset": "linux-gcc10" + "configurePreset": "linux-gcc-10" }, { - "name": "linux-gcc10-release", + "name": "linux-gcc-10-release", "configuration": "Release", - "configurePreset": "linux-gcc10" + "configurePreset": "linux-gcc-10" }, { "name": "macos-arm64-debug", @@ -245,14 +245,14 @@ "testPresets": [ { - "name": "linux-gcc10-release", + "name": "linux-gcc-10-release", "configuration": "Release", - "configurePreset": "linux-gcc10" + "configurePreset": "linux-gcc-10" }, { - "name": "linux-clang10-release", + "name": "linux-clang-10-release", "configuration": "Release", - "configurePreset": "linux-clang10" + "configurePreset": "linux-clang-10" }, { "name": "macos-arm64-release",