LCPQ
/
dft_tools
mirror of https://github.com/triqs/dft_tools
3
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Nils Wentzell 2021-05-28 14:43:10 -04:00
parent 550199fe97 db0b1ab82e
commit ba7edf6053
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@ jobs:
build: build:
strategy: strategy:
fail-fast: false
matrix: matrix:
include: include:
- {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10} - {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10}
@ -25,6 +26,7 @@ jobs:
- name: Install ubuntu dependencies - name: Install ubuntu dependencies
if: matrix.os == 'ubuntu-20.04' if: matrix.os == 'ubuntu-20.04'
run: > run: >
sudo apt-get update &&
sudo apt-get install sudo apt-get install
clang-10 clang-10
g++-10 g++-10
@ -58,8 +60,8 @@ jobs:
- name: Install homebrew dependencies - name: Install homebrew dependencies
if: matrix.os == 'macos-10.15' if: matrix.os == 'macos-10.15'
run: | run: |
brew install gcc@10 llvm@10 boost fftw hdf5 open-mpi openblas numpy scipy mpi4py brew install gcc@10 llvm boost fftw hdf5 open-mpi openblas
pip3 install mako pip3 install mako numpy scipy mpi4py
pip3 install -r requirements.txt pip3 install -r requirements.txt
- name: Build & Install TRIQS - name: Build & Install TRIQS

4
Jenkinsfile vendored
View File

@ -53,8 +53,8 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
/****************** osx builds (on host) */ /****************** osx builds (on host) */
def osxPlatforms = [ def osxPlatforms = [
["gcc", ['CC=gcc-10', 'CXX=g++-10', 'FC=gfortran-10']], ["gcc", ['CC=gcc-11', 'CXX=g++-11', 'FC=gfortran-11']],
["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']] ["clang", ['CC=$BREW/opt/llvm/bin/clang', 'CXX=$BREW/opt/llvm/bin/clang++', 'FC=gfortran-11', '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]