@@ -12,7 +12,7 @@ concurrency:
1212
1313jobs :
1414 setup-linux :
15- runs-on : [self-hosted, Linux, esteco ]
15+ runs-on : [self-hosted, Linux, external ]
1616 name : Setup - Linux
1717 steps :
1818 - name : Checkout build environment information
3333 run : |
3434 rm -rf bitpit
3535 tests-linux :
36- runs-on : [self-hosted, Linux, esteco ]
36+ runs-on : [self-hosted, Linux, external ]
3737 needs : setup-linux
3838 name : Linux (${{ matrix.compiler }}) - MPI ${{ matrix.mpi }} - Debug ${{ matrix.debug }}
3939 strategy :
8181 --target bitpit-test \
8282 -f environments/ubuntu/Dockerfile .
8383 tests-windows :
84- runs-on : [self-hosted, Windows ]
84+ runs-on : [self-hosted, win11, external ]
8585 name : Windows (MSVC) - MPI ${{ matrix.mpi }} - Debug ${{ matrix.debug }}
8686 strategy :
8787 fail-fast : false
@@ -104,6 +104,9 @@ jobs:
104104
105105 echo Prepare environment
106106
107+ echo preloading build tools variables
108+ call C:\BuildTools\VC\Auxiliary\Build\vcvars64.bat
109+
107110 REM Calling setvars.bat works properly only if called with call statement.
108111 call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
109112 IF %SETVARS_COMPLETED% == 1 (echo MKL status.......... Loaded) else (echo MKL status.......... Error)
@@ -113,8 +116,8 @@ jobs:
113116 IF "${{ matrix.debug }}" == "ON" (set "BUILD_TYPE=Debug") ELSE (set "BUILD_TYPE=Release")
114117 echo Build type.......... %BUILD_TYPE%
115118
116- set "PETSC_DIR=C:\petsc\3_19_5 "
117- IF "${{ matrix.mpi }}" == "OFF" (set "PETSC_DIR=%PETSC_DIR%SERIAL ")
119+ set "PETSC_DIR=C:\petsc-mpi "
120+ IF "${{ matrix.mpi }}" == "OFF" (set "PETSC_DIR=C:\petsc ")
118121 echo PETSc directory..... %PETSC_DIR%
119122
120123 set "INSTALL_DIR=%cd%/install"
@@ -131,7 +134,7 @@ jobs:
131134 echo Configure bitpit
132135 set "CMAKE_VARIABLES="
133136 set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBoost_USE_STATIC_LIBS=OFF"
134- set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBOOST_ROOT:PATH=C:\optimad-dependencies\boost\lib\cmake\Boost-1.82 .0"
137+ set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBOOST_ROOT:PATH=C:\optimad-dependencies\boost-v1.80.0 \lib\cmake\Boost-1.80 .0"
135138 set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBITPIT_BUILD_EXAMPLES=ON"
136139 set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBITPIT_ENABLE_INTEGRATION_TESTS=ON"
137140 set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DBITPIT_ENABLE_MPI=${{ matrix.mpi }}"
@@ -142,13 +145,13 @@ jobs:
142145 set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DCMAKE_CONFIGURATION_TYPES=%BUILD_TYPE%"
143146 set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR%"
144147 set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON"
145- IF "${{ matrix.mpi }}" == "ON" (set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DMETIS_DIR=C:\optimad-dependencies\metis-5 .1.0-win\dynamic \")
148+ IF "${{ matrix.mpi }}" == "ON" (set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DMETIS_DIR=C:\optimad-dependencies\Metis-v5 .1.0\")
146149 set "CMAKE_VARIABLES=%CMAKE_VARIABLES% -DPETSC_DIR=%PETSC_DIR%"
147150
148- "C:\Program Files\CMake\bin\ cmake.exe" -G "Visual Studio 17 2022" %CMAKE_VARIABLES% ..
151+ cmake.exe -G "Visual Studio 17 2022" %CMAKE_VARIABLES% ..
149152
150153 echo Build bitpit
151- "C:\Program Files\Microsoft Visual Studio\2022\Community\ MSBuild\Current\Bin\MSBuild .exe" INSTALL.vcxproj /p:Configuration=%BUILD_TYPE% /p:Platform=x64 /m:8
154+ MSBuild.exe INSTALL.vcxproj /p:Configuration=%BUILD_TYPE% /p:Platform=x64 /m:8
152155 - name : Run bitpit tests
153156 shell : cmd
154157 if : matrix.debug == 'OFF'
@@ -164,15 +167,14 @@ jobs:
164167 IF "${{ matrix.debug }}" == "ON" (set "BUILD_TYPE=Debug") ELSE (set "BUILD_TYPE=Release")
165168 echo Build type.......... %BUILD_TYPE%
166169
167- set "PATH=%PATH%;C:\Program Files (x86)\Intel\oneAPI\compiler\latest\windows\redist\intel64_win\compiler\"
168- set "PATH=%PATH%;C:\Program Files (x86)\Intel\oneAPI\mkl\latest\redist\intel64\"
170+ call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
169171
170- set "PATH=%PATH%;C:\optimad-dependencies\boost\lib"
172+ set "PATH=%PATH%;C:\optimad-dependencies\boost-v1.80.0 \lib"
171173
172- IF "${{ matrix.mpi }}" == "ON" (set "PATH=%PATH%;C:\optimad-dependencies\metis-5 .1.0-win\dynamic \lib\")
174+ IF "${{ matrix.mpi }}" == "ON" (set "PATH=%PATH%;C:\optimad-dependencies\Metis-v5 .1.0\lib\")
173175
174- set "PETSC_DIR=C:\petsc\3_19_5 "
175- IF "${{ matrix.mpi }}" == "OFF" (set "PETSC_DIR=%PETSC_DIR%SERIAL ")
176+ set "PETSC_DIR=C:\petsc-mpi "
177+ IF "${{ matrix.mpi }}" == "OFF" (set "PETSC_DIR=C:\petsc ")
176178 set "PATH=%PATH%;%PETSC_DIR%\lib"
177179
178180 set "PATH=%PATH%;%INSTALL_DIR%/bin"
0 commit comments