mirror of
https://github.com/triqs/dft_tools
synced 2024-09-01 08:43:41 +02:00
Merge remote-tracking branch 'app4triqs-remote/3.0.x' into 3.0.x
This commit is contained in:
commit
ba7edf6053
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@ -10,6 +10,7 @@ jobs:
|
||||
build:
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10}
|
||||
@ -25,6 +26,7 @@ jobs:
|
||||
- name: Install ubuntu dependencies
|
||||
if: matrix.os == 'ubuntu-20.04'
|
||||
run: >
|
||||
sudo apt-get update &&
|
||||
sudo apt-get install
|
||||
clang-10
|
||||
g++-10
|
||||
@ -58,8 +60,8 @@ jobs:
|
||||
- name: Install homebrew dependencies
|
||||
if: matrix.os == 'macos-10.15'
|
||||
run: |
|
||||
brew install gcc@10 llvm@10 boost fftw hdf5 open-mpi openblas numpy scipy mpi4py
|
||||
pip3 install mako
|
||||
brew install gcc@10 llvm boost fftw hdf5 open-mpi openblas
|
||||
pip3 install mako numpy scipy mpi4py
|
||||
pip3 install -r requirements.txt
|
||||
|
||||
- name: Build & Install TRIQS
|
||||
|
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -53,8 +53,8 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
|
||||
|
||||
/****************** osx builds (on host) */
|
||||
def osxPlatforms = [
|
||||
["gcc", ['CC=gcc-10', 'CXX=g++-10', 'FC=gfortran-10']],
|
||||
["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']]
|
||||
["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-11', 'CXXFLAGS=-I$BREW/opt/llvm/include', 'LDFLAGS=-L$BREW/opt/llvm/lib']]
|
||||
]
|
||||
for (int i = 0; i < osxPlatforms.size(); i++) {
|
||||
def platformEnv = osxPlatforms[i]
|
||||
|
Loading…
Reference in New Issue
Block a user