LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-12-31 00:25:51 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'app4triqs-remote/3.3.x' into 3.3.x

Browse Source
This commit is contained in:
Nils Wentzell 2024-09-10 12:30:47 -04:00
commit 89434044aa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -2,9 +2,9 @@ name: build
on: on:
push: push:
branches: [ unstable ] branches: [ unstable, '[0-9]+.[0-9]+.x' ]
pull_request: pull_request:
branches: [ unstable ] branches: [ unstable, '[0-9]+.[0-9]+.x' ]
workflow_call: workflow_call:
workflow_dispatch: workflow_dispatch:

6
Jenkinsfile vendored
View File

@ -58,8 +58,8 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
/****************** osx builds (on host) */ /****************** osx builds (on host) */
def osxPlatforms = [ def osxPlatforms = [
["gcc", ['CC=gcc-13', 'CXX=g++-13', 'FC=gfortran-13']], ["gcc", ['CC=gcc-14', 'CXX=g++-14', 'FC=gfortran-14']],
["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-13', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']] ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-14', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']]
] ]
for (int i = 0; i < osxPlatforms.size(); i++) { for (int i = 0; i < osxPlatforms.size(); i++) {
def platformEnv = osxPlatforms[i] def platformEnv = osxPlatforms[i]
@ -87,7 +87,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
"CPLUS_INCLUDE_PATH=$venv/include:$hdf5/include:${env.BREW}/include", "CPLUS_INCLUDE_PATH=$venv/include:$hdf5/include:${env.BREW}/include",
"LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib", "LIBRARY_PATH=$venv/lib:$hdf5/lib:${env.BREW}/lib",
"LD_LIBRARY_PATH=$hdf5/lib", "LD_LIBRARY_PATH=$hdf5/lib",
"PYTHONPATH=$installDir/lib/python3.9/site-packages", "PYTHONPATH=$installDir/lib/python3.12/site-packages",
"CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs", "CMAKE_PREFIX_PATH=$venv/lib/cmake/triqs",
"VIRTUAL_ENV=$venv", "VIRTUAL_ENV=$venv",
"OMP_NUM_THREADS=2"]) { "OMP_NUM_THREADS=2"]) {