From 006075071617eb872837d19895c2e7343e46905d Mon Sep 17 00:00:00 2001 From: Gaetan FUSS Date: Wed, 19 Feb 2025 16:54:19 +0100 Subject: [PATCH 1/3] add pangea-4 build --- .github/workflows/ci_tests.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index f5b2c91ff07..63cf95988dd 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -205,6 +205,14 @@ jobs: # HOST_CONFIG: host-configs/Stanford/sherlock-gcc10.cmake BUILD_SHARED_LIBS: ON + - name: Pangea4 (centos 8, gcc 12.1.0, hpcx 2.20.0, mkl 2023.2.0) + BUILD_AND_TEST_CLI_ARGS: "--build-exe-only" + CMAKE_BUILD_TYPE: Release + DOCKER_REPOSITORY: geosx/pangea4-gcc12.1-hpcxompi2.20.0-onemkl2023.2.0 + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + HOST_CONFIG: /spack-generated.cmake + uses: ./.github/workflows/build_and_test.yml with: BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }} From d8e8705dd9602b9ba78c1fda8f4c7bdb3d84db6b Mon Sep 17 00:00:00 2001 From: Gaetan FUSS Date: Thu, 20 Feb 2025 10:24:59 +0100 Subject: [PATCH 2/3] up TPL tag --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2eb59367050..2c1329225e3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,7 +2,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "GEOS_TPL_TAG": "293-608" + "GEOS_TPL_TAG": "296-613" } }, "runArgs": [ From 293fcce5a135f0a963bf57b5f63ca4e4fda84aa2 Mon Sep 17 00:00:00 2001 From: Gaetan FUSS Date: Thu, 20 Feb 2025 14:19:04 +0100 Subject: [PATCH 3/3] deactivate p4 build unti tests --- .github/workflows/ci_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 63cf95988dd..bfdacd1bbac 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -215,6 +215,7 @@ jobs: uses: ./.github/workflows/build_and_test.yml with: + BUILD_AND_TEST_CLI_ARGS: ${{ matrix.BUILD_AND_TEST_CLI_ARGS }} BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS }} CMAKE_BUILD_TYPE: ${{ matrix.CMAKE_BUILD_TYPE }} DOCKER_IMAGE_TAG: ${{ needs.is_not_draft_pull_request.outputs.DOCKER_IMAGE_TAG }}