From 1547e9df5c2d2b96bd2c72f1e43b00be44c25683 Mon Sep 17 00:00:00 2001 From: Caleb Schilly Date: Tue, 10 Dec 2024 16:08:22 -0500 Subject: [PATCH 1/4] update trilinos container tags --- .github/workflows/ci-trilinos.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-trilinos.yml b/.github/workflows/ci-trilinos.yml index fbd684ad0..3abdc2129 100644 --- a/.github/workflows/ci-trilinos.yml +++ b/.github/workflows/ci-trilinos.yml @@ -32,9 +32,8 @@ jobs: image: - ubuntu-gnu-trilinos-11 tag: - - ef73d14 - - 702aac5 - - trilinos-release-14-4-0 + - 0dc4553 + - 5bbda25 build_type: - Release - Debug From 3e2ec42e3b63058e0a5fdd00839caf522e65b581 Mon Sep 17 00:00:00 2001 From: Caleb Schilly Date: Tue, 10 Dec 2024 16:13:39 -0500 Subject: [PATCH 2/4] disable -werror on trilinos pipeline --- .github/workflows/ci-trilinos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-trilinos.yml b/.github/workflows/ci-trilinos.yml index 3abdc2129..70fa63e97 100644 --- a/.github/workflows/ci-trilinos.yml +++ b/.github/workflows/ci-trilinos.yml @@ -94,7 +94,7 @@ jobs: -D EIGEN_INCLUDE_DIR=/eigen/eigen-${{ env.eigen_version }} \ -D Trilinos_DIR=${{ env.trilinos_dir }}/lib/cmake/Trilinos \ -D CMAKE_INSTALL_PREFIX:PATH=${PRESSIO_INSTALL_DIR} \ - -D CMAKE_CXX_FLAGS='-Wall -Werror' + -D CMAKE_CXX_FLAGS='-Wall' - name: Build run: cmake --build builddir -j $num_cpus --target install From c052d5b26517c7326f23f9ea015ec5957595c25b Mon Sep 17 00:00:00 2001 From: Caleb Schilly Date: Thu, 12 Dec 2024 12:00:30 -0500 Subject: [PATCH 3/4] test with updated pressio-ops --- .github/workflows/ci-trilinos.yml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-trilinos.yml b/.github/workflows/ci-trilinos.yml index 70fa63e97..171ae1cc1 100644 --- a/.github/workflows/ci-trilinos.yml +++ b/.github/workflows/ci-trilinos.yml @@ -65,7 +65,7 @@ jobs: with: repository: Pressio/pressio-ops path: pressio-ops - ref: develop + ref: update-trilinos-containers # develop - name: Preparing environment run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index bda3ca028..b51bcefe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ else() FetchContent_Declare( pressio-ops GIT_REPOSITORY https://github.com/Pressio/pressio-ops.git - GIT_TAG develop + GIT_TAG update-trilinos-containers GIT_PROGRESS TRUE GIT_SHALLOW TRUE ) From 17ad6223d243e51d9d8af88143e800402d40958d Mon Sep 17 00:00:00 2001 From: Caleb Schilly Date: Thu, 12 Dec 2024 12:06:14 -0500 Subject: [PATCH 4/4] restore targeted pressio-ops branch to develop --- .github/workflows/ci-trilinos.yml | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-trilinos.yml b/.github/workflows/ci-trilinos.yml index 171ae1cc1..70fa63e97 100644 --- a/.github/workflows/ci-trilinos.yml +++ b/.github/workflows/ci-trilinos.yml @@ -65,7 +65,7 @@ jobs: with: repository: Pressio/pressio-ops path: pressio-ops - ref: update-trilinos-containers # develop + ref: develop - name: Preparing environment run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index b51bcefe4..bda3ca028 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ else() FetchContent_Declare( pressio-ops GIT_REPOSITORY https://github.com/Pressio/pressio-ops.git - GIT_TAG update-trilinos-containers + GIT_TAG develop GIT_PROGRESS TRUE GIT_SHALLOW TRUE )