From 8daa9e22f8b7a85fe840d61c30b54c83799a7efb Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 4 Mar 2024 14:42:13 -0500 Subject: [PATCH 1/3] Update to Baselibs 7.18.1 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fac00dd9..4dab3155 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.41.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.41.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.25.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.25.1) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.27.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.27.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.11.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.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 0d16c47c..3e35b10e 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.25.1 + tag: v4.27.0 develop: main cmake: From 67b13eba70ebfb4565cdf3423f359849b89cd888 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 2 Apr 2024 15:28:59 -0400 Subject: [PATCH 2/3] Move to Baselibs 7.23.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 b3703fd1..d928bbc2 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.17.0 +baselibs_version: &baselibs_version v7.23.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 b510b74d..ab4d8b51 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.17.0-intelmpi_2021.6.0-intel_2022.1.0 + image: gmao/ubuntu20-geos-env:v7.23.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 4dab3155..cbe01e05 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.41.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.41.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.27.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.27.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.28.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.28.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.11.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.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 3e35b10e..6e4fbc58 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.27.0 + tag: v4.28.0 develop: main cmake: From f8d868f88817911056b11c5184907cd8128b636c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 3 Apr 2024 14:38:03 -0400 Subject: [PATCH 3/3] Update to Open MPI 4 --- README.md | 2 +- components.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cbe01e05..9e0ab518 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.41.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.41.0) | -| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.28.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.28.0) | +| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.28.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.28.1) | | [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.11.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.11.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 6e4fbc58..80aeeb8e 100644 --- a/components.yaml +++ b/components.yaml @@ -5,7 +5,7 @@ GEOSgcm: env: local: ./@env remote: ../ESMA_env.git - tag: v4.28.0 + tag: v4.28.1 develop: main cmake: