From 0aed02e8dabc100d13c8fbba7fa8aa25c3bf70d1 Mon Sep 17 00:00:00 2001 From: Alexandr-Solovev Date: Thu, 5 Sep 2024 09:21:09 -0700 Subject: [PATCH] minor fix --- .ci/pipeline/ci.yml | 2 ++ .ci/scripts/test.bat | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.ci/pipeline/ci.yml b/.ci/pipeline/ci.yml index e66905b0bbd..daf55bca726 100755 --- a/.ci/pipeline/ci.yml +++ b/.ci/pipeline/ci.yml @@ -695,10 +695,12 @@ jobs: displayName: 'Upload build artifacts' continueOnError: true - script: | + call C:\temp\oneapi\setvars.bat --force .\.ci\scripts\test.bat daal\cpp lib msvs cmake .\.ci\scripts\test.bat daal\cpp dll msvs cmake displayName: 'daal/cpp examples' - script: | + call C:\temp\oneapi\setvars.bat --force .\.ci\scripts\test.bat oneapi\cpp lib msvs cmake .\.ci\scripts\test.bat oneapi\cpp dll msvs cmake displayName: 'oneapi/cpp examples' diff --git a/.ci/scripts/test.bat b/.ci/scripts/test.bat index aaced0689be..a2ef555a66f 100644 --- a/.ci/scripts/test.bat +++ b/.ci/scripts/test.bat @@ -34,8 +34,20 @@ echo CPUCOUNT=%CPUCOUNT% echo PATH=C:\msys64\usr\bin;%PATH% set PATH=C:\msys64\usr\bin;%PATH% -echo call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall" x64 -call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall" x64 || set errorcode=1 +echo "%VISUALSTUDIOVERSION% HERE" + +IF "%VS_VER%"=="2017_build_tools" ( + @call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" + echo "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat" +) ELSE ( + IF "%VS_VER%"=="2019_build_tools" ( + @call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" + echo "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat" + ) ELSE ( + @call "C:\temp\oneapi\setvars-vcvarsall.bat" %VS_VER% + echo "C:\temp\oneapi\setvars-vcvarsall.bat" %VS_VER% + ) +) echo call __release_win_vc\daal\latest\env\vars.bat call __release_win_vc\daal\latest\env\vars.bat || set errorcode=1