Update CI to Baselibs 7.13.0

GEOS-ESM · Jun 12, 2023 · 2151843 · 2151843
1 parent b249557
commit 2151843
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,7 @@ parameters:
 
 # Anchors to prevent forgetting to update a version
 os_version: &os_version ubuntu20
-baselibs_version: &baselibs_version v7.7.0
+baselibs_version: &baselibs_version v7.13.0
 bcs_version: &bcs_version v11.00.0
 tag_build_arg_name: &tag_build_arg_name maplversion
 
@@ -148,25 +148,6 @@ workflows:
           fixture_branch: develop
           checkout_mapl_branch: true
 
-      # Build GEOSadas (ifort only, needs a couple develop branches)
-      - ci/build:
-          name: build-GEOSadas-on-<< matrix.compiler >>
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [ifort]
-          resource_class: xlarge
-          baselibs_version: *baselibs_version
-          repo: GEOSadas
-          checkout_fixture: true
-          # This branch on GEOSadas will be used to track subrepos needed
-          # for GEOSadas + MAPL develop much like how we do with MAPL 3
-          #fixture_branch: feature/mathomp4/mapldevelop
-          checkout_mapl_branch: true
-          mepodevelop: false
-          rebuild_procs: 1
-
       # Run GCM (1 hour, no ExtData)
       - ci/run_gcm:
           name: run-GCM-on-<< matrix.compiler >>
@@ -218,6 +199,25 @@ workflows:
             - build-and-test-MAPL-on-<< matrix.compiler >>-using-Unix Makefiles
           baselibs_version: *baselibs_version
 
+  build-GEOSadas:
+    jobs:
+      # Build GEOSadas (ifort only, needs a couple develop branches)
+      - ci/build:
+          name: build-GEOSadas-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [ifort]
+          resource_class: xlarge
+          baselibs_version: *baselibs_version
+          repo: GEOSadas
+          checkout_fixture: true
+          #fixture_branch: feature/mathomp4/ignore-heldsuarez
+          checkout_mapl_branch: true
+          mepodevelop: false
+          rebuild_procs: 1
+
   build-and-publish-docker:
     when:
       equal: [ "release", << pipeline.parameters.GHA_Event >> ]