Skip to content

Commit 8123340

Browse files
authored
Merge branch 'master' into v9.10
2 parents cbcc7f1 + f1875bf commit 8123340

File tree

4 files changed

+51
-4
lines changed

4 files changed

+51
-4
lines changed

.github/workflows/build_macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ${{matrix.os}}
1919
strategy:
2020
matrix:
21-
os: [macos-11]
21+
os: [macos-12]
2222
build_type: [Debug, Release]
2323
steps:
2424
- uses: actions/checkout@v3

.github/workflows/python_wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ jobs:
222222
deactivate'
223223
macos-python-build:
224224
name: macos.amd64.py${{ matrix.config.version }}.build
225-
runs-on: macos-11
225+
runs-on: macos-12
226226
strategy:
227227
matrix:
228228
config:
@@ -254,7 +254,7 @@ jobs:
254254
macos-python-test:
255255
name: macos.amd64.py${{ matrix.version }}.test
256256
needs: macos-python-build
257-
runs-on: macos-11
257+
runs-on: macos-12
258258
strategy:
259259
matrix:
260260
version: [3.6, 3.7, 3.8, 3.9, "3.10"]

.github/workflows/vendor_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
name: core-cli.${{ matrix.os }}.amd64.${{ matrix.build_type }}.AppleClang.standalone
100100
strategy:
101101
matrix:
102-
os: [macos-11]
102+
os: [macos-12]
103103
build_type: [Debug, Release]
104104
steps:
105105
- uses: actions/checkout@v3

CMakePresets.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,53 @@
218218
"value": "On"
219219
}
220220
}
221+
},
222+
{
223+
"name": "vs2022-vcpkg-no-sys-deps",
224+
"generator": "Visual Studio 17 2022",
225+
"binaryDir": "${sourceDir}/build",
226+
"cacheVariables": {
227+
"CMAKE_TOOLCHAIN_FILE": {
228+
"type": "FILEPATH",
229+
"value": "${sourceDir}/ext_libs/vcpkg/scripts/buildsystems/vcpkg.cmake"
230+
},
231+
"BUILD_TESTING": {
232+
"type": "BOOL",
233+
"value": "ON"
234+
},
235+
"RAPIDJSON_SYS_DEP": {
236+
"type": "BOOL",
237+
"value": "OFF"
238+
},
239+
"FMT_SYS_DEP": {
240+
"type": "BOOL",
241+
"value": "OFF"
242+
},
243+
"SPDLOG_SYS_DEP": {
244+
"type": "BOOL",
245+
"value": "OFF"
246+
},
247+
"VW_BOOST_MATH_SYS_DEP": {
248+
"type": "BOOL",
249+
"value": "OFF"
250+
},
251+
"VW_ZLIB_SYS_DEP": {
252+
"type": "BOOL",
253+
"value": "OFF"
254+
},
255+
"VW_GTEST_SYS_DEP": {
256+
"type": "BOOL",
257+
"value": "OFF"
258+
},
259+
"VW_EIGEN_SYS_DEP": {
260+
"type": "BOOL",
261+
"value": "OFF"
262+
},
263+
"VW_STRING_VIEW_LITE_SYS_DEP": {
264+
"type": "BOOL",
265+
"value": "OFF"
266+
}
267+
}
221268
}
222269
],
223270
"buildPresets": [

0 commit comments

Comments
 (0)