From a5447b7da1be40b71b1435fd41f7cb098f106bac Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 6 Jul 2022 10:05:17 -0400 Subject: [PATCH 1/4] Update to MAPL 2.23.0 --- .circleci/config.yml | 2 +- components.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e8ab1b6d..3bb1d2e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 # Anchor to prevent forgetting to update a version -baselibs_version: &baselibs_version v6.3.1 +baselibs_version: &baselibs_version v7.5.0 orbs: ci: geos-esm/circleci-tools@1 diff --git a/components.yaml b/components.yaml index f29772d2..e768d4c6 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSldas: env: local: ./@env remote: ../ESMA_env.git - tag: v3.14.0 + tag: v4.2.0 develop: main cmake: @@ -29,7 +29,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.21.3 + tag: v2.23.0 develop: develop GEOSgcm_GridComp: From 0198ef2dbedb05439f939fdac7c21bef38c44d69 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 13 Jul 2022 15:59:06 -0400 Subject: [PATCH 2/4] Move to Ben hotfix branch --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index e768d4c6..2986d7a7 100644 --- a/components.yaml +++ b/components.yaml @@ -29,7 +29,7 @@ GMAO_Shared: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.23.0 + branch: hotfix/bmauer/fixes-ldas-pr-#568 develop: develop GEOSgcm_GridComp: From bc6b0e63e147612822c20a15f567f5a6fbe2769e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 14 Jul 2022 08:02:44 -0400 Subject: [PATCH 3/4] Useless comment to trigger CI --- components.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/components.yaml b/components.yaml index 2986d7a7..ac3d3d92 100644 --- a/components.yaml +++ b/components.yaml @@ -26,6 +26,7 @@ GMAO_Shared: sparse: ./config/GMAO_Shared.sparse develop: main +# Point to temp branch MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git From 47366b498da8715646c8fcc51820c412a2ca57ee Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 15 Jul 2022 10:40:55 -0400 Subject: [PATCH 4/4] Update to MAPL 2.23.1 --- components.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components.yaml b/components.yaml index ac3d3d92..26b3a0d8 100644 --- a/components.yaml +++ b/components.yaml @@ -26,11 +26,10 @@ GMAO_Shared: sparse: ./config/GMAO_Shared.sparse develop: main -# Point to temp branch MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - branch: hotfix/bmauer/fixes-ldas-pr-#568 + tag: v2.23.1 develop: develop GEOSgcm_GridComp: