Update github actions

GEOS-ESM · Aug 20, 2024 · 49a82ad · 49a82ad
1 parent 0a72343
commit 49a82ad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -12,7 +12,6 @@ executors:
       OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
       OMPI_MCA_btl_vader_single_copy_mechanism: none
     resource_class: large
-    #MEDIUM# resource_class: medium
 
   ifort-large:
     docker:
@@ -21,7 +20,6 @@ executors:
           username: $DOCKERHUB_USER
           password: $DOCKERHUB_AUTH_TOKEN
     resource_class: large
-    #MEDIUM# resource_class: medium
 
 workflows:
   build-test:
@@ -31,7 +29,7 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          context: 
+          context:
             - docker-hub-creds
 
 jobs:
@@ -76,7 +74,6 @@ jobs:
           command: |
             cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-GEOSctm
             make -j"$(nproc)" install |& tee /logfiles/make.log
-            #MEDIUM# make -j4 install |& tee /logfiles/make.log
       - run:
           name: "Compress artifacts"
           command: |

diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml
@@ -8,22 +8,24 @@ jobs:
   require-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v2
+      - 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"
+          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"
           add_comment: true
   blocking-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v2
+      - 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"
           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."
+