From 21885b230022c5c373dcc9e5b1ade8a01eee05f8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 5 Dec 2023 10:27:17 -0500 Subject: [PATCH 1/4] Update to fvdycore 2.8.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b2dc55a4..bddddb2d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ | [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.2.8](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.2.8) | | [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.4.0](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.4.0) | | [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.5.1](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.5.1) | -| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.8.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.8.0) | +| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.8.1](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.8.1) | | [GMI](https://github.com/GEOS-ESM/GMI) | [v1.1.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.1.0) | | [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.6](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.6) | | [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.2.1](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.2.1) | diff --git a/components.yaml b/components.yaml index a041525f..7773f28c 100644 --- a/components.yaml +++ b/components.yaml @@ -67,7 +67,7 @@ FVdycoreCubed_GridComp: fvdycore: local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp/@fvdycore remote: ../GFDL_atmos_cubed_sphere.git - tag: geos/v2.8.0 + tag: geos/v2.8.1 develop: geos/develop GEOSchem_GridComp: From 8462622b0fbffd65d4ee522dd5ad471f23998de1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 5 Dec 2023 10:38:38 -0500 Subject: [PATCH 2/4] Update to Baselibs v7.17.0 --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 2 +- README.md | 2 +- components.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d275a76..a47f0310 100644 --- 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.14.0 +baselibs_version: &baselibs_version v7.17.0 bcs_version: &bcs_version v11.3.0 tag_build_arg_name: &tag_build_arg_name gcmversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index cfaede22..57a5d96a 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -19,7 +19,7 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')" runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env:v7.14.0-intelmpi_2021.6.0-intel_2022.1.0 + image: gmao/ubuntu20-geos-env:v7.17.0-intelmpi_2021.6.0-intel_2022.1.0 # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495 # It seems like we might not need secrets on GitHub Actions which is good for forked # pull requests diff --git a/README.md b/README.md index b2dc55a4..362d5f32 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ | [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc) | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1) | | [ecbuild](https://github.com/GEOS-ESM/ecbuild) | [geos/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) | | [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.36.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.36.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.22.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.22.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.24.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.24.0) | | [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.8](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.8) | | [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.9.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.9.0) | | [geos-chem](https://github.com/GEOS-ESM/geos-chem) | [geos/v13.0.0-rc1](https://github.com/GEOS-ESM/geos-chem/releases/tag/geos%2Fv13.0.0-rc1) | diff --git a/components.yaml b/components.yaml index a041525f..445d0a75 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.22.0 + tag: v4.24.0 develop: main cmake: From 622172bf00f577b7e94fe6e29c76e8c2f21ea918 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 5 Dec 2023 11:18:19 -0500 Subject: [PATCH 3/4] Update to MAPL 2.42.2 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b2dc55a4..a9a63673 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ | [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.2.1](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.2.1) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.1.1](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.1.1) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.42.0](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.42.0) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.42.2](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.42.2) | | [MITgcm](https://github.com/GEOS-ESM/MITgcm) | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o) | | [MOM5](https://github.com/GEOS-ESM/MOM5) | [geos/5.1.0+1.2.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B1.2.0) | | [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v2.2.3](https://github.com/GEOS-ESM/MOM6/tree/geos/v2.2.3) | diff --git a/components.yaml b/components.yaml index a041525f..adce0557 100644 --- a/components.yaml +++ b/components.yaml @@ -42,7 +42,7 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.42.0 + tag: v2.42.2 develop: develop FMS: From 96a38e9e839449030d0f2efdfe8125a7634aaa1d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 6 Dec 2023 10:56:58 -0500 Subject: [PATCH 4/4] Update to MAPL 2.42.3 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a9a63673..ff64b491 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ | [GOCART](https://github.com/GEOS-ESM/GOCART) | [v2.2.1](https://github.com/GEOS-ESM/GOCART/releases/tag/v2.2.1) | | [HEMCO](https://github.com/GEOS-ESM/HEMCO) | [geos/v2.2.3](https://github.com/GEOS-ESM/HEMCO/releases/tag/geos%2Fv2.2.3) | | [Icepack](https://github.com/GEOS-ESM/Icepack) | [geos/v0.1.1](https://github.com/GEOS-ESM/Icepack/releases/tag/geos%2Fv0.1.1) | -| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.42.2](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.42.2) | +| [MAPL](https://github.com/GEOS-ESM/MAPL) | [v2.42.3](https://github.com/GEOS-ESM/MAPL/releases/tag/v2.42.3) | | [MITgcm](https://github.com/GEOS-ESM/MITgcm) | [checkpoint68o](https://github.com/GEOS-ESM/MITgcm/releases/tag/checkpoint68o) | | [MOM5](https://github.com/GEOS-ESM/MOM5) | [geos/5.1.0+1.2.0](https://github.com/GEOS-ESM/MOM5/releases/tag/geos%2F5.1.0%2B1.2.0) | | [MOM6](https://github.com/GEOS-ESM/MOM6) | [geos/v2.2.3](https://github.com/GEOS-ESM/MOM6/tree/geos/v2.2.3) | diff --git a/components.yaml b/components.yaml index adce0557..0dc5d514 100644 --- a/components.yaml +++ b/components.yaml @@ -42,7 +42,7 @@ GEOS_Util: MAPL: local: ./src/Shared/@MAPL remote: ../MAPL.git - tag: v2.42.2 + tag: v2.42.3 develop: develop FMS: