LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-12-22 20:34:38 +01:00
Code Issues Releases Wiki Activity

[jenkins] osx-gcc: switch to gcc 9

Browse Source
This commit is contained in:
Dylan Simon 2020-02-11 14:08:10 -05:00
parent 483dc46b2a
commit 0982a5f898
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -5,9 +5,9 @@ ARG APPNAME=app4triqs
COPY requirements.txt /src/$APPNAME/requirements.txt COPY requirements.txt /src/$APPNAME/requirements.txt
RUN pip install -r /src/$APPNAME/requirements.txt RUN pip install -r /src/$APPNAME/requirements.txt
COPY . $SRC/$APPNAME COPY --chown=build . $SRC/$APPNAME
WORKDIR $BUILD/$APPNAME WORKDIR $BUILD/$APPNAME
RUN chown -R build $SRC/$APPNAME . RUN chown build .
USER build USER build
ARG BUILD_DOC=0 ARG BUILD_DOC=0
RUN cmake $SRC/$APPNAME -DTRIQS_ROOT=${INSTALL} -DBuild_Documentation=${BUILD_DOC} && make -j2 && make test CTEST_OUTPUT_ON_FAILURE=1 RUN cmake $SRC/$APPNAME -DTRIQS_ROOT=${INSTALL} -DBuild_Documentation=${BUILD_DOC} && make -j2 && make test CTEST_OUTPUT_ON_FAILURE=1

2
Jenkinsfile vendored
View File

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