Merge branch 'develop' into feature/mathomp4/add-additional-debug-flags

GEOS-ESM · Dec 14, 2022 · 8075850 · 8075850
2 parents 3824459 + a194187
commit 8075850
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,7 +35,8 @@ workflows:
           matrix:
             parameters:
               compiler: [ifort]
-              cmake_generator: ['Unix Makefiles', 'Ninja']
+              #cmake_generator: ['Unix Makefiles', 'Ninja']
+              cmake_generator: ['Unix Makefiles']
           baselibs_version: *baselibs_version
           repo: MAPL
           mepodevelop: false
@@ -61,7 +62,8 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran]
-              cmake_generator: ['Unix Makefiles', 'Ninja']
+              #cmake_generator: ['Unix Makefiles', 'Ninja']
+              cmake_generator: ['Unix Makefiles']
           baselibs_version: *baselibs_version
           repo: MAPL
           mepodevelop: false
@@ -84,38 +86,80 @@ workflows:
           run_unit_tests: true
           ctest_options: "-LE 'PERFORMANCE|EXTDATA1G_BIG_TESTS|EXTDATA2G_BIG_TESTS' --output-on-failure"
 
-      # Build GEOSgcm
+      # Build GEOSgcm -- ifort
       - ci/build:
           name: build-GEOSgcm-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort]
+              compiler: [ifort]
+          baselibs_version: *baselibs_version
+          repo: GEOSgcm
+          checkout_fixture: true
+          mepodevelop: true
+          checkout_mapl_branch: true
+          persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra, retained for one day
+
+      # Build GEOSgcm -- GCC -- only to main
+      - ci/build:
+          filters:
+            branches:
+              only:
+                - main
+          name: build-GEOSgcm-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [gfortran]
           baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true
           mepodevelop: true
           checkout_mapl_branch: true
           persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra, retained for one day
 
-      # Build GEOSldas
+      # Build GEOSldas on ifort
       - ci/build:
           name: build-GEOSldas-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort]
+              compiler: [ifort]
+          baselibs_version: *baselibs_version
+          repo: GEOSldas
+          mepodevelop: false
+          checkout_fixture: true
+          fixture_branch: develop
+          checkout_mapl_branch: true
+
+      # Build GEOSldas on gfortran -- only to main
+      - ci/build:
+          filters:
+            branches:
+              only:
+                - main
+          name: build-GEOSldas-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [gfortran]
           baselibs_version: *baselibs_version
           repo: GEOSldas
           mepodevelop: false
           checkout_fixture: true
           fixture_branch: develop
           checkout_mapl_branch: true
 
-      # Build GEOSadas (ifort only, needs a couple develop branches)
+      # Build GEOSadas (ifort only, needs a couple develop branches) -- only to main
       - ci/build:
+          filters:
+            branches:
+              only:
+                - main
           name: build-GEOSadas-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
@@ -133,8 +177,12 @@ workflows:
           mepodevelop: false
           rebuild_procs: 1
 
-      # Run GCM (1 hour, no ExtData)
+      # Run GCM (1 hour, no ExtData) -- only to main
       - ci/run_gcm:
+          filters:
+            branches:
+              only:
+                - main
           name: run-GCM-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
@@ -147,8 +195,12 @@ workflows:
           baselibs_version: *baselibs_version
           bcs_version: *bcs_version
 
-      # Run Coupled GCM (1 hour, no ExtData)
+      # Run Coupled GCM (1 hour, no ExtData) -- only to main
       - ci/run_gcm:
+          filters:
+            branches:
+              only:
+                - main
           name: run-coupled-GCM-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
@@ -163,14 +215,19 @@ workflows:
           gcm_ocean_type: MOM6
           change_layout: false
 
-      # Run MAPL Tutorials
+      # Run MAPL Tutorials -- only to main
       - ci/run_mapl_tutorial:
+          filters:
+            branches:
+              only:
+                - main
           name: run-<< matrix.tutorial_name >>-Tutorial-with-<< matrix.compiler >>
           context:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort]
+              #compiler: [gfortran, ifort]
+              compiler: [ifort]
               tutorial_name:
                 - hello_world
                 - parent_no_children

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Update `components.yaml`
   - ESMA_cmake v3.22.0 (defines stricter debug flags for Intel)
+- Reduced amount of CI tests to reduce cost
 
 ### Fixed