Merge branch 'master' into v9.10

VowpalWabbit · Jul 18, 2024 · 8123340 · 8123340
2 parents cbcc7f1 + f1875bf
commit 8123340
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 4 deletions.
diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [macos-11]
+        os: [macos-12]
         build_type: [Debug, Release]
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/python_wheels.yml b/.github/workflows/python_wheels.yml
@@ -222,7 +222,7 @@ jobs:
             deactivate'
   macos-python-build:
     name: macos.amd64.py${{ matrix.config.version }}.build
-    runs-on: macos-11
+    runs-on: macos-12
     strategy:
       matrix:
         config:
@@ -254,7 +254,7 @@ jobs:
   macos-python-test:
     name: macos.amd64.py${{ matrix.version }}.test
     needs: macos-python-build
-    runs-on: macos-11
+    runs-on: macos-12
     strategy:
       matrix:
         version: [3.6, 3.7, 3.8, 3.9, "3.10"]

diff --git a/.github/workflows/vendor_build.yml b/.github/workflows/vendor_build.yml
@@ -99,7 +99,7 @@ jobs:
     name: core-cli.${{ matrix.os }}.amd64.${{ matrix.build_type }}.AppleClang.standalone
     strategy:
       matrix:
-        os: [macos-11]
+        os: [macos-12]
         build_type: [Debug, Release]
     steps:
       - uses: actions/checkout@v3

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -218,6 +218,53 @@
           "value": "On"
         }
       }
+    },
+    {
+      "name": "vs2022-vcpkg-no-sys-deps",
+      "generator": "Visual Studio 17 2022",
+      "binaryDir": "${sourceDir}/build",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": {
+          "type": "FILEPATH",
+          "value": "${sourceDir}/ext_libs/vcpkg/scripts/buildsystems/vcpkg.cmake"
+        },
+        "BUILD_TESTING": {
+          "type": "BOOL",
+          "value": "ON"
+        },
+        "RAPIDJSON_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "FMT_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "SPDLOG_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "VW_BOOST_MATH_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "VW_ZLIB_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "VW_GTEST_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "VW_EIGEN_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        },
+        "VW_STRING_VIEW_LITE_SYS_DEP": {
+          "type": "BOOL",
+          "value": "OFF"
+        }
+      }
     }
   ],
   "buildPresets": [