Edit .gitlab-ci-correaa.yml

correaa · Feb 16, 2025 · 45fc89f · 45fc89f
1 parent 26fe061
commit 45fc89f
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/.gitlab-ci-correaa.yml b/.gitlab-ci-correaa.yml
@@ -333,20 +333,25 @@ vs2019-windows:
   needs: ["clang++", "g++"]
   timeout: 30 minutes
 
+#winget install Microsoft.PowerShell
+#winget install -e --id Kitware.CMake
+# install Boost binaries from here https://sourceforge.net/projects/boost/
+
 vs2022-shell c++17:
   stage: build
   allow_failure: true
   interruptible: true
   variables:
-    BOOST_ROOT: ${CI_PROJECT_DIR}/vcpkg/installed/x64-windows
+    #BOOST_ROOT: ${CI_PROJECT_DIR}/vcpkg/installed/x64-windows
+    BOOST_ROOT: C:\local\boost_1_86_0
   script:
     # - choco --version
     # - choco install -y visualstudio2019community poshgit
+    - $env:Path += ";${CI_PROJECT_DIR}/vcpkg/installed/x64-windows/bin;C:\Program Files\CMake\bin;C:\Program Files\7-Zip;C:\local\boost_1_86_0\lib"
     - git clone --depth=1 https://github.com/microsoft/vcpkg.git
     - .\vcpkg\bootstrap-vcpkg.bat
     - .\vcpkg\vcpkg install boost-multi-array boost-timer
     - mkdir build
-    - $env:Path += ";${CI_PROJECT_DIR}/vcpkg/installed/x64-windows/bin;C:\Program Files\CMake\bin"
     - cmake --version
     - cmake -S . -B build -DCMAKE_CXX_STANDARD=17
     - cmake --build build --config Release --parallel 4 --verbose
@@ -361,15 +366,16 @@ vs2022-shell c++23:
   allow_failure: true
   interruptible: true
   variables:
-    BOOST_ROOT: ${CI_PROJECT_DIR}/vcpkg/installed/x64-windows
+    #BOOST_ROOT: ${CI_PROJECT_DIR}/vcpkg/installed/x64-windows
+    BOOST_ROOT: C:\local\boost_1_86_0
   script:
     # - choco --version
     # - choco install -y visualstudio2019community poshgit
+    - $env:Path += ";${CI_PROJECT_DIR}/vcpkg/installed/x64-windows/bin;C:\Program Files\CMake\bin;C:\Program Files\7-Zip;C:\local\boost_1_86_0\lib"
     - git clone --depth=1 https://github.com/microsoft/vcpkg.git
     - .\vcpkg\bootstrap-vcpkg.bat
     - .\vcpkg\vcpkg install boost-multi-array boost-timer
     - mkdir build
-    - $env:Path += ";${CI_PROJECT_DIR}/vcpkg/installed/x64-windows/bin;C:\Program Files\CMake\bin"
     - cmake --version
     - cmake -S . -B build -DCMAKE_CXX_STANDARD=23
     - cmake --build build --config Release --parallel 4 --verbose