From db1ebb04e961ea04097b8bc77ecdaa385f456438 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Sat, 20 Sep 2025 13:19:21 +0200 Subject: Improve INSTALL_ARGS handling and update OpenSSL version (#22978) --- apps/installer/includes/os_configs/windows.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/installer/includes/os_configs/windows.sh b/apps/installer/includes/os_configs/windows.sh index c25e931169..b99c2bfebf 100644 --- a/apps/installer/includes/os_configs/windows.sh +++ b/apps/installer/includes/os_configs/windows.sh @@ -8,10 +8,10 @@ # microsoft-build-tools # mysql -INSTALL_ARGS="" +INSTALL_ARGS=() if [[ $CONTINUOUS_INTEGRATION ]]; then - INSTALL_ARGS=" --no-progress " + INSTALL_ARGS+=(--no-progress) else { # try choco uninstall -y -n cmake.install cmake # needed to make sure that following install set the env properly @@ -19,12 +19,12 @@ else echo "nothing to do" } - choco install -y --skip-checksums $INSTALL_ARGS git visualstudio2022community + choco install -y --skip-checksums "${INSTALL_ARGS[@]}" git visualstudio2022community fi -choco install -y --skip-checksums $INSTALL_ARGS cmake.install -y --installargs 'ADD_CMAKE_TO_PATH=System' -choco install -y --skip-checksums $INSTALL_ARGS visualstudio2022-workload-nativedesktop -choco install -y --skip-checksums $INSTALL_ARGS openssl --force --version=3.5.2 -choco install -y --skip-checksums $INSTALL_ARGS boost-msvc-14.3 --force --version=1.87.0 -choco install -y --skip-checksums $INSTALL_ARGS mysql --force --version=8.4.4 +choco install -y --skip-checksums "${INSTALL_ARGS[@]}" cmake.install -y --installargs 'ADD_CMAKE_TO_PATH=System' +choco install -y --skip-checksums "${INSTALL_ARGS[@]}" visualstudio2022-workload-nativedesktop +choco install -y --skip-checksums "${INSTALL_ARGS[@]}" openssl --force --version=3.5.3 +choco install -y --skip-checksums "${INSTALL_ARGS[@]}" boost-msvc-14.3 --force --version=1.87.0 +choco install -y --skip-checksums "${INSTALL_ARGS[@]}" mysql --force --version=8.4.4 -- cgit v1.2.3