From ab8cd729e5bdd92fdf58fcb7fd776b92e9a2b933 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 6 Feb 2025 09:00:46 -0500 Subject: [PATCH 1/4] v2: Update CI with latest GFE --- .circleci/config.yml | 4 ++-- .github/workflows/workflow.yml | 4 ++-- CHANGELOG.md | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6d6cc4e4c934..c2943bb9b641 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.29.0 +baselibs_version: &baselibs_version v7.30.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:76b980fe7271aa8935d2f10bbcb525c14f3cf2ea workflows: build-and-test-MAPL: diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 865a7d3d7136..c75dd5cebdcc 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.29.0-openmpi_5.0.5-gcc_14.2.0 + image: gmao/ubuntu24-geos-env-mkl:v7.30.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.29.0-intelmpi_2021.13-ifort_2021.13 + image: gmao/ubuntu24-geos-env:v7.30.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 9d5789250a67..7a040fc026f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed + - Add column for ACG (ALIAS) that set the pointer variable to a different name than the `short_name` +- Updated CI to use Baselibs 7.30.0 + - Updates to GFE v1.17.0 ### Fixed From 1730908ad18c10a9a0222fdcc203de8b614ae852 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 6 Feb 2025 19:01:01 -0500 Subject: [PATCH 2/4] Update to Baselibs 7.31.0 --- .circleci/config.yml | 4 ++-- .github/workflows/workflow.yml | 4 ++-- CHANGELOG.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c2943bb9b641..5b274457e1a0 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.30.0 +baselibs_version: &baselibs_version v7.31.0 bcs_version: &bcs_version v11.6.0 tag_build_arg_name: &tag_build_arg_name maplversion orbs: - ci: geos-esm/circleci-tools@dev:76b980fe7271aa8935d2f10bbcb525c14f3cf2ea + ci: geos-esm/circleci-tools@ev:f575a5374fb38d1fe2ed99af680db3b01c34a135 workflows: build-and-test-MAPL: diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index c75dd5cebdcc..d4260d2ee421 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.30.0-openmpi_5.0.5-gcc_14.2.0 + image: gmao/ubuntu24-geos-env-mkl:v7.31.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.30.0-intelmpi_2021.13-ifort_2021.13 + image: gmao/ubuntu24-geos-env:v7.31.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 7a040fc026f5..73441d35f995 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,8 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Add column for ACG (ALIAS) that set the pointer variable to a different name than the `short_name` -- Updated CI to use Baselibs 7.30.0 - - Updates to GFE v1.17.0 +- Updated CI to use Baselibs 7.31.0 + - Updates to GFE v1.18.0 ### Fixed From 569fadaed6400cf4e2fe5ce4c040696a52e3a36c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 6 Feb 2025 19:02:52 -0500 Subject: [PATCH 3/4] Fix typo --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5b274457e1a0..3d602c05407b 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@ev:f575a5374fb38d1fe2ed99af680db3b01c34a135 + ci: geos-esm/circleci-tools@dev:f575a5374fb38d1fe2ed99af680db3b01c34a135 workflows: build-and-test-MAPL: From 701cb1f1cabd38d729cb1f61ffe700dcf8520a25 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 6 Feb 2025 19:21:11 -0500 Subject: [PATCH 4/4] Back to orb v4 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d602c05407b..d4221d22c6ce 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:f575a5374fb38d1fe2ed99af680db3b01c34a135 + ci: geos-esm/circleci-tools@4 workflows: build-and-test-MAPL: