Renamed CI presets for clarity

lballabio · Oct 29, 2021 · 632692f · 632692f
1 parent 374a5a0
commit 632692f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -33,8 +33,8 @@ jobs:
       env:
         CXXFLAGS: -O2
       run: |
-        cmake --preset linux-gcc-options-release
-        cmake --build --preset linux-gcc-options-release -j2
+        cmake --preset linux-ci-build-with-nonstandard-options
+        cmake --build --preset linux-ci-build-with-nonstandard-options -j2
     - name: Test
       run: |
         cd build
@@ -73,8 +73,8 @@ jobs:
       env:
         BOOST_ROOT: C:\local\boost-1.75.0
       run: |
-        cmake --preset windows-msvc-x64-options
-        cmake --build --preset windows-msvc-x64-options-release
+        cmake --preset windows-ci-build-with-nonstandard-options
+        cmake --build --preset windows-ci-build-with-nonstandard-options
     - name: Test
       run: |
         cd build

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -37,22 +37,6 @@
         "CMAKE_CXX_COMPILER": "g++"
       }
     },
-    {
-      "name": "linux-gcc-options-release",
-      "binaryDir": "${sourceDir}/build",
-      "generator": "Unix Makefiles",
-      "cacheVariables": {
-        "BOOST_ROOT": "/usr",
-        "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_CXX_COMPILER": "g++",
-        "CMAKE_CXX_STANDARD": "17",
-        "QL_ENABLE_SESSIONS": "ON",
-        "QL_ENABLE_THREAD_SAFE_OBSERVER_PATTERN": "ON",
-        "QL_HIGH_RESOLUTION_DATE": "ON",
-        "QL_USE_INDEXED_COUPON": "ON",
-        "QL_USE_STD_CLASSES": "ON"
-      }
-    },
     {
       "name": "windows-clang-x64",
       "binaryDir": "${sourceDir}/build",
@@ -89,7 +73,23 @@
       }
     },
     {
-      "name": "windows-msvc-x64-options",
+      "name": "linux-ci-build-with-nonstandard-options",
+      "binaryDir": "${sourceDir}/build",
+      "generator": "Unix Makefiles",
+      "cacheVariables": {
+        "BOOST_ROOT": "/usr",
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_CXX_COMPILER": "g++",
+        "CMAKE_CXX_STANDARD": "17",
+        "QL_ENABLE_SESSIONS": "ON",
+        "QL_ENABLE_THREAD_SAFE_OBSERVER_PATTERN": "ON",
+        "QL_HIGH_RESOLUTION_DATE": "ON",
+        "QL_USE_INDEXED_COUPON": "ON",
+        "QL_USE_STD_CLASSES": "ON"
+      }
+    },
+    {
+      "name": "windows-ci-build-with-nonstandard-options",
       "binaryDir": "${sourceDir}/build",
       "generator": "Visual Studio 16 2019",
       "architecture": {
@@ -131,10 +131,6 @@
       "name": "linux-gcc-release",
       "configurePreset": "linux-gcc-release"
     },
-    {
-      "name": "linux-gcc-options-release",
-      "configurePreset": "linux-gcc-options-release"
-    },
     {
       "name": "windows-clang-x64-debug",
       "configurePreset": "windows-clang-x64",
@@ -156,9 +152,13 @@
       "configuration": "Release"
     },
     {
-      "name": "windows-msvc-x64-options-release",
-      "configurePreset": "windows-msvc-x64-options",
+      "name": "linux-ci-build-with-nonstandard-options",
+      "configurePreset": "linux-ci-build-with-nonstandard-options"
+    },
+    {
+      "name": "windows-ci-build-with-nonstandard-options",
+      "configurePreset": "windows-ci-build-with-nonstandard-options",
       "configuration": "Release"
     }
   ]
-}
+}