From d29fff2f56a786e0f9b29aeef0153ca3487d6322 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Thu, 16 Jun 2022 15:00:32 -0400
Subject: [PATCH 1/3] Update ESMA_cmake and ESMA_env

---
 .circleci/config.yml | 43 +++++++++++--------------------------------
 components.yaml      |  6 +++---
 2 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9bc8e492..cc5a658c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,42 +1,21 @@
 version: 2.1
 
+# Anchor to prevent forgetting to update a version
+baselibs_version: &baselibs_version v6.3.1
+
 orbs:
-  circleci-tools: geos-esm/circleci-tools@0.13.0
+  ci: geos-esm/circleci-tools@1
 
 workflows:
   build-test:
     jobs:
-      - build-GEOSldas:
-          name: build-GEOSldas-on-<< matrix.compiler >>
-          matrix:
-            parameters:
-              compiler: [gfortran, ifort]
+      - ci/build:
+          name: build-GEOSgcm-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
-
-jobs:
-  build-GEOSldas:
-    parameters:
-      compiler:
-        type: string
-    executor:
-      name: circleci-tools/<< parameters.compiler >>
-      resource_class: large
-    working_directory: /root/project
-    steps:
-      - checkout:
-          path: GEOSldas
-      - circleci-tools/versions:
-          compiler: << parameters.compiler >>
-      - circleci-tools/mepoclone:
-          repo: GEOSldas
-      - circleci-tools/checkout_if_exists:
-          repo: GEOSldas
-      - circleci-tools/cmake:
-          repo: GEOSldas
-          compiler: << parameters.compiler >>
-      - circleci-tools/buildinstall:
+          matrix:
+            parameters:
+              compiler: [ifort, gfortran]
+          baselibs_version: *baselibs_version
           repo: GEOSldas
-      - circleci-tools/compress_artifacts
-      - store_artifacts:
-          path: /logfiles
+          persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
diff --git a/components.yaml b/components.yaml
index d47af71b..f29772d2 100644
--- a/components.yaml
+++ b/components.yaml
@@ -5,13 +5,13 @@ GEOSldas:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v3.13.0
+  tag: v3.14.0
   develop: main
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.12.0
+  tag: v3.17.0
   develop: develop
 
 ecbuild:
@@ -29,7 +29,7 @@ GMAO_Shared:
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.19.0
+  tag: v2.21.3
   develop: develop
 
 GEOSgcm_GridComp:

From 4886167fe6411ba4904e407771d00897040c014e Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Thu, 16 Jun 2022 15:52:46 -0400
Subject: [PATCH 2/3] Fix CI

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cc5a658c..936e7441 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ workflows:
   build-test:
     jobs:
       - ci/build:
-          name: build-GEOSgcm-on-<< matrix.compiler >>
+          name: build-GEOSldas-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
           matrix:
@@ -18,4 +18,5 @@ workflows:
               compiler: [ifort, gfortran]
           baselibs_version: *baselibs_version
           repo: GEOSldas
+          mapldevelop: false
           persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra

From c40ee94657b5195dde978bc02f64c1921af3cfa6 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Thu, 16 Jun 2022 16:43:44 -0400
Subject: [PATCH 3/3] Actually fix the CI

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 936e7441..e8ab1b6d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,5 +18,5 @@ workflows:
               compiler: [ifort, gfortran]
           baselibs_version: *baselibs_version
           repo: GEOSldas
-          mapldevelop: false
+          mepodevelop: false
           persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra