From 92d5d58fd870c2f9cfbb90095eccde2cefc873d8 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 30 Jul 2024 09:32:08 -0400 Subject: [PATCH 1/2] Add Refactor to PR Template --- .github/PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0e3987557aa7..226b68f73357 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -3,6 +3,7 @@ - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Trivial change (affects only documentation or cleanup) +- [ ] Refactor (no functional changes, no api changes) ## Checklist - [ ] Tested this change with a run of GEOSgcm From f11add481b0331f07a2581e588b04c1dad19e68c Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 30 Jul 2024 09:54:46 -0400 Subject: [PATCH 2/2] Fix up CI --- .circleci/config.yml | 6 +++--- .github/workflows/workflow.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bae974ba32af..0a1c854571f0 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.23.0 +baselibs_version: &baselibs_version v7.25.0 bcs_version: &bcs_version v11.5.0 tag_build_arg_name: &tag_build_arg_name maplversion @@ -179,9 +179,9 @@ workflows: baselibs_version: *baselibs_version container_name: mapl mpi_name: intelmpi - mpi_version: 2021.6.0 + mpi_version: "2021.13" compiler_name: intel - compiler_version: 2022.1.0 + compiler_version: "2024.2" image_name: geos-env tag_build_arg_name: *tag_build_arg_name - ci/publish_docker: diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index f4b1e5f07cbc..76ed2d251565 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -35,7 +35,7 @@ jobs: name: Build and Test MAPL GNU runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env-mkl:v7.24.0-openmpi_5.0.2-gcc_13.2.0 + image: gmao/ubuntu20-geos-env-mkl:v7.25.0-openmpi_5.0.2-gcc_13.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 @@ -86,7 +86,7 @@ jobs: name: Build and Test MAPL Intel runs-on: ubuntu-latest container: - image: gmao/ubuntu20-geos-env:v7.24.0-intelmpi_2021.6.0-intel_2022.1.0 + image: gmao/ubuntu20-geos-env:v7.25.0-intelmpi_2021.13-intel_2024.2 # 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