GitFlow: Handmerge main to develop 2024-Apr-11

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,36 +1,14 @@
-<!--- These lines are comments. You can delete or ignore them -->
-<!--- NOTE: If your PR is trivial, feel free to delete the "Related Issue" -->
-<!---       "Testing" or other sections. -->
+## Types of change(s)
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] 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)
 
-<!--- Provide a general summary of your changes in the Title above -->
+## Checklist
+- [ ] Tested this change with a run of GEOSgcm
+- [ ] Ran the Unit Tests (`make tests`)
 
 ## Description
-<!--- Describe your changes in detail -->
 
 ## Related Issue
-<!--- This project primarily accepts pull requests related to open issues -->
-<!--- If suggesting a new feature or change, please discuss it in an issue first -->
-<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
-<!--- Please link to the issue here: -->
-
-## Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-## Types of changes
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] 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)
 
-## Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] I have tested this change with a run of GEOSgcm (if non-trivial)
-- [ ] I have added one of the required labels (0 diff, 0 diff trivial, 0 diff structural, non 0-diff)
-- [ ] I have updated the CHANGELOG.md accordingly following the style of [Keep a Changelog](https://keepachangelog.com/en/1.0.0/#how)

.github/stale.yml

@@ -4,15 +4,15 @@ daysUntilStale: 60
 daysUntilClose: 7
 # Issues with these labels will never be considered stale
 exemptLabels:
-  - long term
-  - security
+  - :hourglass: Long Term
 # Label to use when marking an issue as stale
-staleLabel: stale
+staleLabel:
+  - :snowflake: Stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
   recent activity. If there are no updates within 7 days, it will be closed.
-  You can add the "long term" tag to prevent the Stale bot from closing
+  You can add the "Long Term" label to prevent the Stale bot from closing
   this issue.
 # Comment to post when closing a stale issue. Set to `false` to disable
 closeComment: Closing due to inactivity

.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.
 

.github/workflows/enforce-labels.yml

@@ -14,7 +14,7 @@ jobs:
         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."
 
@@ -27,6 +27,6 @@ jobs:
         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."

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

@@ -20,7 +20,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           source_branch: develop
           target_branch: release/MAPL-v3
-          label: automatic,MAPL3,Skip Changelog
+          label: ":chart_with_upwards_trend: MAPL3,Changelog Skip,:wrench: Github Actions"
           template: .github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
           # Turning this to false until the action can get a fix for
           # https://github.com/devops-infra/action-pull-request/issues/126
@@ -29,5 +29,5 @@ jobs:
           assignee: ${{ github.actor }}
           old_string: "<!-- Write your description here -->"
           new_string: ${{ github.event.commits[0].message }}
-          title: Auto PR - develop → MAPL-v3 - ${{ github.event.commits[0].message }}
+          title: Auto GitFlow - develop → MAPL-v3 - ${{ github.event.commits[0].message }}
 

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

@@ -20,7 +20,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           source_branch: main
           target_branch: develop
-          label: automatic
+          label: ":wrench: Github Actions"
           template: .github/PULL_REQUEST_TEMPLATE/gitflow_main_develop.md
           get_diff: true
           assignee: ${{ github.actor }}