Merge branch 'R21C' into feature/bmauer/time_ave_r21c

GEOS-ESM · Jun 21, 2024 · 3336633 · 3336633
2 parents b197ffa + 9ff79d7
commit 3336633
Show file tree

Hide file tree

Showing 7 changed files with 247 additions and 159 deletions.
diff --git a/.github/workflows/changelog-enforcer.yml b/.github/workflows/changelog-enforcer.yml
@@ -11,12 +11,12 @@ jobs:
     - uses: dangoslen/changelog-enforcer@v3
       with:
         changeLogPath: 'CHANGELOG.md'
-        skipLabels: 'Skip Changelog,0 diff trivial,automatic,dependencies,github_actions'
+        skipLabels: "Changelog Skip,0 Diff Trivial,:wrench: Github Actions"
         missingUpdateErrorMessage: >
             No update to CHANGELOG.md found! Please add a changelog
             entry to it describing your change.  Please note that the
             keepachangelog (https://keepachangelog.com) format is
             used. If your change is very trivial not applicable for a
-            changelog entry, add a 'Skip Changelog' label to the pull
+            changelog entry, add a 'Changelog Skip' label to the pull
             request to skip the changelog enforcer.
 
diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml
@@ -8,25 +8,25 @@ jobs:
   require-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v3
+      - uses: mheap/github-action-required-labels@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           mode: minimum
           count: 1
-          labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled,github_actions"
+          labels: "0 diff,0 diff trivial,:astonished: Non 0 Diff,:wrench: Github Actions"
           add_comment: true
           message: "This PR is being prevented from merging because you have not added one of our required labels: {{ provided }}. Please add one so that the PR can be merged."
 
   blocking-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v3
+      - uses: mheap/github-action-required-labels@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           mode: exactly
           count: 0
-          labels: "Contingent - DNA,Needs Lead Approval,Contingent -- Do Not Approve"
+          labels: ":no_entry_sign: Contingent - DNA"
           add_comment: true
           message: "This PR is being prevented from merging because you have added one of our blocking labels: {{ provided }}. You'll need to remove it before this PR can be merged."
diff --git a/.github/workflows/validate_yaml_files.yml b/.github/workflows/validate_yaml_files.yml
@@ -15,7 +15,7 @@ jobs:
   validate-YAML:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.3.0
+      - uses: actions/checkout@v4
       - id: yaml-lint
         name: yaml-lint
         uses: ibiqlik/action-yamllint@v3
@@ -24,7 +24,7 @@ jobs:
           format: colored
           config_file: .yamllint.yml
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: yamllint-logfile

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -30,11 +30,11 @@ jobs:
       OMPI_MCA_btl_vader_single_copy_mechanism: none
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
+        uses: styfle/cancel-workflow-action@0.12.1
         with:
           access_token: ${{ github.token }}
       - name: Checkout
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Set all directories as git safe
@@ -86,11 +86,11 @@ jobs:
         #password: ${{ secrets.DOCKERHUB_TOKEN }}
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.11.0
+        uses: styfle/cancel-workflow-action@0.12.1
         with:
           access_token: ${{ github.token }}
       - name: Checkout
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Set all directories as git safe