From 4910813bc149e03fbb0b543d86b4d40b907b371a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 15 Jan 2025 14:49:11 -0500 Subject: [PATCH 1/3] Move to use Baselibs 7.29.0 in CI --- .circleci/config.yml | 4 ++-- .github/workflows/workflow.yml | 4 ++-- CHANGELOG.md | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 88afe2ca124e..20e07208b915 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,12 +16,12 @@ parameters: # Anchors to prevent forgetting to update a version os_version: &os_version ubuntu24 -baselibs_version: &baselibs_version v7.27.0 +baselibs_version: &baselibs_version v7.29.0 bcs_version: &bcs_version v11.6.0 tag_build_arg_name: &tag_build_arg_name maplversion orbs: - ci: geos-esm/circleci-tools@4 + ci: geos-esm/circleci-tools@dev:d8b3f251c745f4b7b16964aae42095de82b59b11 workflows: build-and-test-MAPL: diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index d0194d858c52..865a7d3d7136 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -38,7 +38,7 @@ jobs: name: Build and Test MAPL GNU runs-on: ubuntu-latest container: - image: gmao/ubuntu24-geos-env-mkl:v7.27.0-openmpi_5.0.5-gcc_14.2.0 + image: gmao/ubuntu24-geos-env-mkl:v7.29.0-openmpi_5.0.5-gcc_14.2.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 @@ -89,7 +89,7 @@ jobs: name: Build and Test MAPL Intel runs-on: ubuntu-latest container: - image: gmao/ubuntu24-geos-env:v7.27.0-intelmpi_2021.13-ifort_2021.13 + image: gmao/ubuntu24-geos-env:v7.29.0-intelmpi_2021.13-ifort_2021.13 # 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/CHANGELOG.md b/CHANGELOG.md index d2fdf3ce41b7..caca9c0883f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Changed MAPL_ESMFRegridder to require the dstMaskValues to be added as grid attribute to use fixed masking, fixes UFS issue - Increased formatting width of time index in ExtData2G diagnostic print - Updated GitHub checkout action to use blobless clones +- Update CI to use Baselibs 7.29.0 by default + - This provides ESMF 8.8.0 ### Fixed From b374c4759ac1a429f929a5ccb9851b7a333dfbc7 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 15 Jan 2025 15:17:01 -0500 Subject: [PATCH 2/3] Use correct orb dev version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 20e07208b915..7a1e023c6512 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ bcs_version: &bcs_version v11.6.0 tag_build_arg_name: &tag_build_arg_name maplversion orbs: - ci: geos-esm/circleci-tools@dev:d8b3f251c745f4b7b16964aae42095de82b59b11 + ci: geos-esm/circleci-tools@dev:3757bb798cb16579e4631876735162774b6e18f6 workflows: build-and-test-MAPL: From e41772cd1569da9694f42149a6c0f7febc84ed03 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 16 Jan 2025 11:05:22 -0500 Subject: [PATCH 3/3] Update components for Baselibs 7.29.0 --- CHANGELOG.md | 6 ++++++ components.yaml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30cb4f601c8d..3bf2084bcd69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updated GitHub checkout action to use blobless clones - Update CI to use Baselibs 7.29.0 by default - This provides ESMF 8.8.0 +- Update `components.yaml` + - ESMA_env v4.34.0 + - Update to MPT 2.30 at NAS + - Update to Baselibs 7.29.0 (ESMF 8.8.0) + - ESMA_cmake v3.56.0 + - Use `LOCATION` Python `FIND_STRATEGY` ### Fixed diff --git a/components.yaml b/components.yaml index 3d65a1df9aa4..bedab2379e88 100644 --- a/components.yaml +++ b/components.yaml @@ -5,13 +5,13 @@ MAPL: ESMA_env: local: ./ESMA_env remote: ../ESMA_env.git - tag: v4.32.0 + tag: v4.34.0 develop: main ESMA_cmake: local: ./ESMA_cmake remote: ../ESMA_cmake.git - tag: v3.55.0 + tag: v3.56.0 develop: develop ecbuild: