Merge pull request #1835 from GEOS-ESM/develop

GitFlow: Merge develop into main for release

.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.5.0
+baselibs_version: &baselibs_version v7.6.1
 bcs_version: &bcs_version v10.23.0
 tag_build_arg_name: &tag_build_arg_name maplversion
 

.github/workflows/push-to-develop.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Run the action
-        uses: devops-infra/[email protected].1
+        uses: devops-infra/[email protected].3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           source_branch: develop

.github/workflows/push-to-main.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Run the action
-        uses: devops-infra/[email protected].1
+        uses: devops-infra/[email protected].3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           source_branch: main

.github/workflows/workflow.yml

@@ -17,7 +17,7 @@ jobs:
     name: Build and Test MAPL GNU
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env-mkl:v7.5.0-openmpi_4.1.2-gcc_11.2.0
+      image: gmao/ubuntu20-geos-env-mkl:v7.6.1-openmpi_4.1.4-gcc_12.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
@@ -77,7 +77,7 @@ jobs:
     name: Build and Test MAPL Intel
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env:v7.5.0-intelmpi_2021.3.0-intel_2021.3.0
+      image: gmao/ubuntu20-geos-env:v7.6.1-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