build: Refactor macos-* CMake presets (#2765)

Signed-off-by: Julien Jerphanion <[email protected]>
Co-authored-by: Max Morozov <[email protected]>

Author: jjerphan

.github/workflows/build_with_conda.yml

@@ -216,15 +216,15 @@ jobs:
         if: ${{ inputs.run_cpp_tests == true || github.event_name != 'workflow_dispatch' }}
         shell: bash -l {0}
         run: |
-          cd cpp/out/darwin-conda-release-build/
+          cd cpp/out/macos-conda-release-build/
           make -j ${{ steps.cpu-cores.outputs.count }} arcticdb_rapidcheck_tests
           make -j ${{ steps.cpu-cores.outputs.count }} test_unit_arcticdb
 
       - name: Run C++ Tests
         if: ${{ inputs.run_cpp_tests == true|| github.event_name != 'workflow_dispatch' }}
         shell: bash -l {0}
         run: |
-          cd cpp/out/darwin-conda-release-build/
+          cd cpp/out/macos-conda-release-build/
           CTEST_OUTPUT_ON_FAILURE=1 make test
 
       - name: Install npm

cpp/CMakePresets.json

@@ -120,10 +120,8 @@
       "name": "linux-conda-debug",
       "inherits":  ["common_conda", "linux"]
     },
-
-
     {
-      "name": "darwin",
+      "name": "macos",
       "hidden": true,
       "generator": "Unix Makefiles",
       "cacheVariables": {
@@ -132,35 +130,22 @@
       "environment": {"cmakepreset_expected_host_system": "Darwin"}
     },
     {
-      "name": "darwin-conda-debug",
-      "inherits": ["common_conda", "darwin"]
+      "name": "macos-conda-debug",
+      "inherits": ["common_conda", "macos"]
     },
     {
-      "name": "macos",
-      "hidden": true,
-      "inherits": "darwin",
+      "name": "macos-debug",
+      "inherits": ["common_vcpkg", "macos"],
       "cacheVariables": {
-        "CMAKE_OSX_ARCHITECTURES": "arm64",
         "CMAKE_OSX_DEPLOYMENT_TARGET": "15.0",
         "CMAKE_C_COMPILER_LAUNCHER": "sccache",
         "CMAKE_CXX_COMPILER_LAUNCHER": "sccache"
       }
     },
-    {
-      "name": "macos-debug",
-      "inherits": ["common_vcpkg", "macos"]
-    },
-    {
-      "name": "macos-conda-debug",
-      "inherits": ["common_conda", "macos"]
-    },
-
-
     { "name": "windows-cl-release",       "inherits": "windows-cl-debug",       "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" }},
     { "name": "windows-cl-conda-release", "inherits": "windows-cl-conda-debug", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" } },
     { "name": "linux-release",            "inherits": "linux-debug",            "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } },
     { "name": "linux-conda-release",      "inherits": "linux-conda-debug",      "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } },
-    { "name": "darwin-conda-release",     "inherits": "darwin-conda-debug",     "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } },
     { "name": "macos-release",            "inherits": "macos-debug",            "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } },
     { "name": "macos-conda-release",      "inherits": "macos-conda-debug",      "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo" } }
   ],
@@ -173,8 +158,6 @@
     {"name": "linux-release",             "configurePreset": "linux-release",             "targets": "arcticdb_ext" },
     {"name": "linux-conda-debug",         "configurePreset": "linux-conda-debug",         "targets": "arcticdb_ext" },
     {"name": "linux-conda-release",       "configurePreset": "linux-conda-release",       "targets": "arcticdb_ext" },
-    {"name": "darwin-conda-debug",        "configurePreset": "darwin-conda-debug",        "targets": "arcticdb_ext" },
-    {"name": "darwin-conda-release",      "configurePreset": "darwin-conda-release",      "targets": "arcticdb_ext" },
     {"name": "macos-debug",               "configurePreset": "macos-debug",               "targets": "arcticdb_ext" },
     {"name": "macos-release",             "configurePreset": "macos-release",             "targets": "arcticdb_ext" },
     {"name": "macos-conda-debug",         "configurePreset": "macos-conda-debug",         "targets": "arcticdb_ext" },

docs/mkdocs/docs/technical/contributing.md

@@ -128,7 +128,7 @@ For instance:
 
   ```bash
   export ARCTICDB_USING_CONDA=1
-  cmake -DTEST=off --preset darwin-conda-release cpp
+  cmake -DTEST=off --preset macos-conda-release cpp
   cd cpp
 
   # You might need to use fewer threads than what's possible your machine

setup.py

@@ -188,7 +188,13 @@ def build_extension(self, ext):
             conda_suffix = "-conda" if ARCTICDB_USING_CONDA else ""
             suffix = "-debug" if self.debug else "-release"
             suffix = conda_suffix + suffix
-            preset = ("windows-cl" if platform.system() == "Windows" else platform.system().lower()) + suffix
+            system_name = platform.system()
+            if system_name == "Windows":
+                preset = "windows-cl" + suffix
+            elif system_name == "Darwin":
+                preset = "macos" + suffix
+            else:
+                preset = system_name.lower() + suffix
 
         cmd = [
             cmake,