From 547a7e32116777d9a48868d44a2d38e4e60cbc5d Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 30 Oct 2020 14:37:34 -0400 Subject: [PATCH 1/5] Ignore build* directories in .dockerignore --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index b627e92a..ab7e50dc 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,3 +2,4 @@ Dockerfile Jenkinsfile .git/objects/pack +build* From 32df9c4c5feee15497aec3d942fa02e09df4cfab Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 30 Oct 2020 14:39:40 -0400 Subject: [PATCH 2/5] [cmake] Set VERSION property for project library using major and minor version numbers --- c++/app4triqs/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/c++/app4triqs/CMakeLists.txt b/c++/app4triqs/CMakeLists.txt index ed2b050b..7f566014 100644 --- a/c++/app4triqs/CMakeLists.txt +++ b/c++/app4triqs/CMakeLists.txt @@ -6,7 +6,10 @@ add_library(${PROJECT_NAME}::${PROJECT_NAME}_c ALIAS ${PROJECT_NAME}_c) target_link_libraries(${PROJECT_NAME}_c PUBLIC triqs PRIVATE $) # Configure target and compilation -set_property(TARGET ${PROJECT_NAME}_c PROPERTY POSITION_INDEPENDENT_CODE ON) +set_target_properties(${PROJECT_NAME}_c PROPERTIES + POSITION_INDEPENDENT_CODE ON + VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} +) target_include_directories(${PROJECT_NAME}_c PUBLIC $) target_include_directories(${PROJECT_NAME}_c SYSTEM INTERFACE $) target_compile_definitions(${PROJECT_NAME}_c PUBLIC From 4d88bddd0bd0853260baa70982b75e48dcdb1a8a Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 30 Oct 2020 14:40:39 -0400 Subject: [PATCH 3/5] [gh-actions] Do not stop all builds if one of them fails --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a306add9..ee04d92a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,7 @@ jobs: build: strategy: + fail-fast: false matrix: include: - {os: ubuntu-20.04, cc: gcc-10, cxx: g++-10} From 2446cc58433271758e25d8cfb93269f208a09137 Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 30 Oct 2020 14:41:28 -0400 Subject: [PATCH 4/5] [gh-actions] Fix broken llvm brew install command --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee04d92a..674bd6c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,7 +59,7 @@ 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 + brew install gcc@10 llvm boost fftw hdf5 open-mpi openblas numpy scipy mpi4py pip3 install mako pip3 install -r requirements.txt From d4fba7b4ce439a59bd847ed476946ca1ffdeb80e Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Fri, 30 Oct 2020 15:15:17 -0400 Subject: [PATCH 5/5] [gh-actions] Install numpy scipy and mpi4py through pip3 instead of brew --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 674bd6c9..df029662 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,8 +59,8 @@ jobs: - name: Install homebrew dependencies if: matrix.os == 'macos-10.15' run: | - brew install gcc@10 llvm 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