Update tag - try gcc configs

GEOS-DEV · Mar 14, 2024 · c04206e · c04206e
1 parent cb7efd0
commit c04206e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "GEOS_TPL_TAG": "261-163"
+            "GEOS_TPL_TAG": "261-238"
         }
     },
     "runArgs": [

diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -124,24 +124,28 @@ jobs:
       fail-fast : false
       matrix:
         include:
-          # - name: Ubuntu (20.04, gcc 9.3.0, open-mpi 4.0.3)
-          #   CMAKE_BUILD_TYPE: Release
-          #   DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9
+          - name: Ubuntu (20.04, gcc 9.3.0, open-mpi 4.0.3)
+            CMAKE_BUILD_TYPE: Release
+            DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9
+            HOST_CONFIG: /spack-generated.cmake
 
-          # - name: Ubuntu debug (20.04, gcc 10.3.0, open-mpi 4.0.3) - github codespaces
-          #   CMAKE_BUILD_TYPE: Debug
-          #   DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10
+          - name: Ubuntu debug (20.04, gcc 10.3.0, open-mpi 4.0.3) - github codespaces
+            CMAKE_BUILD_TYPE: Debug
+            DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10
+            HOST_CONFIG: /spack-generated.cmake
 
-          # - name: Ubuntu (20.04, gcc 10.3.0, open-mpi 4.0.3) - github codespaces
-          #   CMAKE_BUILD_TYPE: Release
-          #   DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10
+          - name: Ubuntu (20.04, gcc 10.3.0, open-mpi 4.0.3) - github codespaces
+            CMAKE_BUILD_TYPE: Release
+            DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10
+            HOST_CONFIG: /spack-generated.cmake
 
-          # - name: Ubuntu (22.04, gcc 11.2.0, open-mpi 4.1.2)
-          #   CMAKE_BUILD_TYPE: Release
-          #   DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11
-          #   ENABLE_HYPRE: ON
-          #   ENABLE_TRILINOS: OFF
-          #   GCP_BUCKET: geosx/ubuntu22.04-gcc11
+          - name: Ubuntu (22.04, gcc 11.2.0, open-mpi 4.1.2)
+            CMAKE_BUILD_TYPE: Release
+            DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11
+            ENABLE_HYPRE: ON
+            ENABLE_TRILINOS: OFF
+            GCP_BUCKET: geosx/ubuntu22.04-gcc11
+            HOST_CONFIG: /spack-generated.cmake
 
           - name: Ubuntu (22.04, gcc 12.3.0, open-mpi 4.1.2)
             CMAKE_BUILD_TYPE: Release