Skip to content

Commit 167ab5f

Browse files
committed
Fix Windows C++ client CI dependencies
1 parent b7d1975 commit 167ab5f

3 files changed

Lines changed: 4 additions & 13 deletions

File tree

.github/workflows/client-cpp-package.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
echo "run_windows=${run_windows}" >> "$GITHUB_OUTPUT"
127127
128128
# Compact JSON (no leading whitespace); required for GITHUB_OUTPUT + fromJSON().
129-
WINDOWS_MATRIX='[{"name":"windows-vs2026","runs-on":"windows-2025-vs2026","boost_choco":"boost-msvc-14.3","boost_choco_version":"","cmake_generator":"Visual Studio 18 2026","package_classifier":"windows-x86_64-msvc14.4","vs_choco":"","vs_choco_params":""},{"name":"windows-vs2022","runs-on":"windows-2022","boost_choco":"boost-msvc-14.3","boost_choco_version":"","cmake_generator":"","package_classifier":"windows-x86_64-msvc14.3","vs_choco":"","vs_choco_params":""},{"name":"windows-vs2019","runs-on":"windows-2022","boost_choco":"boost-msvc-14.2","boost_choco_version":"","cmake_generator":"Visual Studio 16 2019","package_classifier":"windows-x86_64-msvc14.2","vs_choco":"visualstudio2019buildtools","vs_choco_params":"--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended"},{"name":"windows-vs2017","runs-on":"windows-2022","boost_choco":"","boost_choco_version":"","cmake_generator":"Visual Studio 15 2017","package_classifier":"windows-x86_64-msvc14.1","vs_choco":"visualstudio2017buildtools","vs_choco_params":"--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended"}]'
129+
WINDOWS_MATRIX='[{"name":"windows-vs2026","runs-on":"windows-2025-vs2026","boost_choco":"","boost_choco_version":"","cmake_generator":"Visual Studio 18 2026","package_classifier":"windows-x86_64-msvc14.4","vs_choco":"","vs_choco_params":""},{"name":"windows-vs2022","runs-on":"windows-2022","boost_choco":"","boost_choco_version":"","cmake_generator":"","package_classifier":"windows-x86_64-msvc14.3","vs_choco":"","vs_choco_params":""},{"name":"windows-vs2019","runs-on":"windows-2022","boost_choco":"","boost_choco_version":"","cmake_generator":"Visual Studio 16 2019","package_classifier":"windows-x86_64-msvc14.2","vs_choco":"visualstudio2019buildtools","vs_choco_params":"--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended"},{"name":"windows-vs2017","runs-on":"windows-2022","boost_choco":"","boost_choco_version":"","cmake_generator":"Visual Studio 15 2017","package_classifier":"windows-x86_64-msvc14.1","vs_choco":"visualstudio2017buildtools","vs_choco_params":"--add Microsoft.VisualStudio.Workload.VCTools --includeRecommended"}]'
130130
131131
write_windows_matrix_output() {
132132
local matrix_json="$1"
@@ -386,10 +386,6 @@ jobs:
386386
}
387387
echo "BOOST_INCLUDEDIR=$($boostDir.FullName)" >> $env:GITHUB_ENV
388388
}
389-
choco install openssl -y --no-progress
390-
$sslPath = (Get-ChildItem 'C:\Program Files\OpenSSL*' -Directory | Select-Object -First 1).FullName
391-
echo "$sslPath\bin" >> $env:GITHUB_PATH
392-
echo "OPENSSL_ROOT_DIR=$sslPath" >> $env:GITHUB_ENV
393389
- name: Cache Maven packages
394390
uses: actions/cache@v5
395391
with:

.github/workflows/multi-language-client.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,6 @@ jobs:
9191
if: runner.os == 'Windows'
9292
run: |
9393
choco install winflexbison3 -y
94-
choco install boost-msvc-14.3 -y
95-
$boost_path = (Get-ChildItem -Path 'C:\local\' -Filter 'boost_*').FullName
96-
echo $boost_path >> $env:GITHUB_PATH
97-
choco install openssl -y
98-
$sslPath = (Get-ChildItem 'C:\Program Files\OpenSSL*' -Directory | Select-Object -First 1).FullName
99-
echo "$sslPath\bin" >> $env:GITHUB_PATH
100-
echo "OPENSSL_ROOT_DIR=$sslPath" >> $env:GITHUB_ENV
10194
choco install llvm --version=17.0.6 --force -y
10295
clang-format --version
10396
- name: Cache Maven packages

iotdb-client/client-cpp/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ endif()
7171

7272
set(IOTDB_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/third-party"
7373
CACHE PATH "Local tarball cache for third-party dependencies (lives under client-cpp/)")
74-
if(APPLE)
74+
if(WIN32)
75+
set(_iotdb_default_boost_version "1.74.0")
76+
elseif(APPLE)
7577
set(_iotdb_default_boost_version "1.84.0")
7678
else()
7779
set(_iotdb_default_boost_version "1.60.0")

0 commit comments

Comments
 (0)