Skip to content

Commit c730fd7

Browse files
committed
Merge remote-tracking branch 'app4triqs/3.0.x' into 3.0.x
2 parents 587f5c4 + 7c8d2ff commit c730fd7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
5353

5454
/****************** osx builds (on host) */
5555
def osxPlatforms = [
56-
["gcc", ['CC=gcc-9', 'CXX=g++-9', 'FC=gfortran-9']]
57-
/* ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-9', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']] disabled as libcxx leads to test failures due to different random number sequences */
56+
["gcc", ['CC=gcc-10', 'CXX=g++-10', 'FC=gfortran-10']]
57+
/* ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-10', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']] disabled as libcxx leads to test failures due to different random number sequences */
5858
]
5959
for (int i = 0; i < osxPlatforms.size(); i++) {
6060
def platformEnv = osxPlatforms[i]
@@ -82,7 +82,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
8282
"CPLUS_INCLUDE_PATH=$venv/include:$hdf5/include:${env.BREW}/include",
8383
"LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib",
8484
"LD_LIBRARY_PATH=$hdf5/lib",
85-
"PYTHONPATH=$installDir/lib/python3.7/site-packages",
85+
"PYTHONPATH=$installDir/lib/python3.8/site-packages",
8686
"CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs",
8787
"NPY_DISTUTILS_APPEND_FLAGS=1"]) {
8888
deleteDir()

0 commit comments

Comments
 (0)