CI

jll63 · Aug 15, 2024 · b1108b7 · b1108b7
1 parent 157b31f
commit b1108b7
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -43,8 +43,8 @@ jobs:
           - os: ubuntu-latest
             compiler: clang++-20
             pre_configure: dev/ci-pre-configure-clang 20
-          - os: ubuntu-latest
-            compiler: g++-12
+          # - os: ubuntu-latest
+          #   compiler: g++-12
           - os: macos-latest
             compiler: c++
           - os: windows-latest

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -216,6 +216,36 @@
                 "YOMM2_SHARED": "ON"
             }
         },
+        {
+            "name": "ninja-cl-static",
+            "generator": "Ninja Multi-Config",
+            "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
+            "binaryDir": "${sourceDir}/builds/${presetName}",
+            "cacheVariables": {
+                "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+                "CMAKE_CXX_COMPILER": "cl",
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
+                "YOMM2_ENABLE_EXAMPLES": "ON",
+                "YOMM2_ENABLE_TESTS": "ON",
+                "YOMM2_ENABLE_BENCHMARKS": "ON",
+                "YOMM2_SHARED": "OFF"
+            }
+        },
+        {
+            "name": "ninja-cl-shared",
+            "generator": "Ninja Multi-Config",
+            "toolchainFile": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
+            "binaryDir": "${sourceDir}/builds/${presetName}",
+            "cacheVariables": {
+                "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+                "CMAKE_CXX_COMPILER": "cl",
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
+                "YOMM2_ENABLE_EXAMPLES": "ON",
+                "YOMM2_ENABLE_TESTS": "ON",
+                "YOMM2_ENABLE_BENCHMARKS": "ON",
+                "YOMM2_SHARED": "ON"
+            }
+        },
         {
             "name": "msbuild-cl-static",
             "generator": "Visual Studio 17 2022",
@@ -468,6 +498,36 @@
             "configurePreset": "ninja-c++-shared",
             "configuration": "RelWithDebInfo"
         },
+        {
+            "name": "build-ninja-cl-static-dbg",
+            "configurePreset": "ninja-cl-static",
+            "configuration": "Debug"
+        },
+        {
+            "name": "build-ninja-cl-static-rel",
+            "configurePreset": "ninja-cl-static",
+            "configuration": "Release"
+        },
+        {
+            "name": "build-ninja-cl-static-reldbg",
+            "configurePreset": "ninja-cl-static",
+            "configuration": "RelWithDebInfo"
+        },
+        {
+            "name": "build-ninja-cl-shared-dbg",
+            "configurePreset": "ninja-cl-shared",
+            "configuration": "Debug"
+        },
+        {
+            "name": "build-ninja-cl-shared-rel",
+            "configurePreset": "ninja-cl-shared",
+            "configuration": "Release"
+        },
+        {
+            "name": "build-ninja-cl-shared-reldbg",
+            "configurePreset": "ninja-cl-shared",
+            "configuration": "RelWithDebInfo"
+        },
         {
             "name": "build-msbuild-cl-static-dbg",
             "configurePreset": "msbuild-cl-static",
@@ -710,6 +770,36 @@
             "configurePreset": "ninja-c++-shared",
             "configuration": "RelWithDebInfo"
         },
+        {
+            "name": "test-ninja-cl-static-dbg",
+            "configurePreset": "ninja-cl-static",
+            "configuration": "Debug"
+        },
+        {
+            "name": "test-ninja-cl-static-rel",
+            "configurePreset": "ninja-cl-static",
+            "configuration": "Release"
+        },
+        {
+            "name": "test-ninja-cl-static-reldbg",
+            "configurePreset": "ninja-cl-static",
+            "configuration": "RelWithDebInfo"
+        },
+        {
+            "name": "test-ninja-cl-shared-dbg",
+            "configurePreset": "ninja-cl-shared",
+            "configuration": "Debug"
+        },
+        {
+            "name": "test-ninja-cl-shared-rel",
+            "configurePreset": "ninja-cl-shared",
+            "configuration": "Release"
+        },
+        {
+            "name": "test-ninja-cl-shared-reldbg",
+            "configurePreset": "ninja-cl-shared",
+            "configuration": "RelWithDebInfo"
+        },
         {
             "name": "test-msbuild-cl-static-dbg",
             "configurePreset": "msbuild-cl-static",

diff --git a/dev/presetgen b/dev/presetgen
@@ -14,7 +14,7 @@ class ToolChain:
 
 
 TOOLCHAINS = {
-    "ninja": ToolChain("Ninja Multi-Config", "clang++ g++ c++".split()),
+    "ninja": ToolChain("Ninja Multi-Config", "clang++ g++ c++ cl".split()),
     "msbuild": ToolChain(
         "Visual Studio 17 2022",
         ["cl"],