From 558ecab610f0855d3c0906de5960996f12e3c8b1 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 4 Apr 2024 10:45:26 -0400 Subject: [PATCH 1/6] Update pull request template and github actions --- .github/PULL_REQUEST_TEMPLATE.md | 38 +++++------------------- .github/workflows/changelog-enforcer.yml | 4 +-- .github/workflows/enforce-labels.yml | 4 +-- 3 files changed, 12 insertions(+), 34 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f54d4f9f452f..0e3987557aa7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,36 +1,14 @@ - - - +## 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) - +## Checklist +- [ ] Tested this change with a run of GEOSgcm +- [ ] Ran the Unit Tests (`make tests`) ## Description - ## Related Issue - - - - - -## Motivation and Context - - -## How Has This Been Tested? - - - - -## Types of changes - -- [ ] 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: - - -- [ ] 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) diff --git a/.github/workflows/changelog-enforcer.yml b/.github/workflows/changelog-enforcer.yml index 043ac2ee81f6..ed89c8bd941d 100644 --- 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,automatic' 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 index 86f4bb4e440b..718b68009dac 100644 --- a/.github/workflows/enforce-labels.yml +++ b/.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,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic" 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: "Contingent - DNA,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." From a921bc02fda0a9c36dffa88a79ee01103a7c4a87 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 10 Apr 2024 09:59:59 -0400 Subject: [PATCH 2/6] Update CI --- .circleci/config.yml | 2 +- .github/workflows/workflow.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b4dee0c83db0..1d1bcb1827f0 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.17.0 +baselibs_version: &baselibs_version v7.23.0 bcs_version: &bcs_version v11.3.0 tag_build_arg_name: &tag_build_arg_name maplversion diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 4a360a7d2b51..3395269cf48b 100644 --- a/.github/workflows/workflow.yml +++ b/.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.17.0-openmpi_5.0.0-gcc_12.1.0 + image: gmao/ubuntu20-geos-env-mkl:v7.23.0-openmpi_5.0.0-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.17.0-intelmpi_2021.6.0-intel_2022.1.0 + image: gmao/ubuntu20-geos-env:v7.23.0-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 From f19fa12c7d197431ceb5a2f19018bf5b05cb658e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Apr 2024 09:45:13 -0400 Subject: [PATCH 3/6] Use emoji labels --- .github/stale.yml | 7 +++---- .github/workflows/changelog-enforcer.yml | 2 +- .github/workflows/enforce-labels.yml | 4 ++-- .github/workflows/push-to-develop.yml | 4 ++-- .github/workflows/push-to-main.yml | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index 393b5c694988..8e872e910b06 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -4,15 +4,14 @@ 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 diff --git a/.github/workflows/changelog-enforcer.yml b/.github/workflows/changelog-enforcer.yml index ed89c8bd941d..f7df2f3f97b5 100644 --- a/.github/workflows/changelog-enforcer.yml +++ b/.github/workflows/changelog-enforcer.yml @@ -11,7 +11,7 @@ jobs: - uses: dangoslen/changelog-enforcer@v3 with: changeLogPath: 'CHANGELOG.md' - skipLabels: 'Changelog Skip,0 diff trivial,automatic' + 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 diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml index 718b68009dac..d9dc79b76f2a 100644 --- a/.github/workflows/enforce-labels.yml +++ b/.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" + 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,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/push-to-develop.yml b/.github/workflows/push-to-develop.yml index 951723f0988f..660f46457ef7 100644 --- a/.github/workflows/push-to-develop.yml +++ b/.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: "" 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 }} diff --git a/.github/workflows/push-to-main.yml b/.github/workflows/push-to-main.yml index dde2e2352994..e5bf25630669 100644 --- a/.github/workflows/push-to-main.yml +++ b/.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 }} From 3e885a6febb859a5a9308ca9c41268a568ffbf35 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Apr 2024 10:03:44 -0400 Subject: [PATCH 4/6] Fix yaml --- .github/stale.yml | 3 ++- .github/workflows/push-to-develop.yml | 5 ++++- .github/workflows/push-to-main.yml | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/stale.yml b/.github/stale.yml index 8e872e910b06..1853ab92ea79 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -6,7 +6,8 @@ daysUntilClose: 7 exemptLabels: - :hourglass: Long Term # Label to use when marking an issue as stale -staleLabel: :snowflake: 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 diff --git a/.github/workflows/push-to-develop.yml b/.github/workflows/push-to-develop.yml index 660f46457ef7..906bd8d0140e 100644 --- a/.github/workflows/push-to-develop.yml +++ b/.github/workflows/push-to-develop.yml @@ -20,7 +20,10 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: develop target_branch: release/MAPL-v3 - label: :chart_with_upwards_trend: MAPL3, Changelog Skip, :wrench: Github Actions + 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 diff --git a/.github/workflows/push-to-main.yml b/.github/workflows/push-to-main.yml index e5bf25630669..cecc07c8930c 100644 --- a/.github/workflows/push-to-main.yml +++ b/.github/workflows/push-to-main.yml @@ -20,7 +20,8 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: main target_branch: develop - label: :wrench: Github Actions + label: + - :wrench: Github Actions template: .github/PULL_REQUEST_TEMPLATE/gitflow_main_develop.md get_diff: true assignee: ${{ github.actor }} From 1557bc354f4813fde8cdb684ee2091c060fbf25a Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Apr 2024 10:24:22 -0400 Subject: [PATCH 5/6] Fix yaml again --- .github/workflows/push-to-develop.yml | 5 +---- .github/workflows/push-to-main.yml | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/push-to-develop.yml b/.github/workflows/push-to-develop.yml index 906bd8d0140e..36bb7c0c3378 100644 --- a/.github/workflows/push-to-develop.yml +++ b/.github/workflows/push-to-develop.yml @@ -20,10 +20,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: develop target_branch: release/MAPL-v3 - label: - - :chart_with_upwards_trend: MAPL3 - - Changelog Skip - - :wrench: Github Actions + 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 diff --git a/.github/workflows/push-to-main.yml b/.github/workflows/push-to-main.yml index cecc07c8930c..6c8a112a92e9 100644 --- a/.github/workflows/push-to-main.yml +++ b/.github/workflows/push-to-main.yml @@ -20,8 +20,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: main target_branch: develop - label: - - :wrench: Github Actions + label: ":wrench: Github Actions" template: .github/PULL_REQUEST_TEMPLATE/gitflow_main_develop.md get_diff: true assignee: ${{ github.actor }} From 06018251868a81ab9b0be7a0300898d52aed8dab Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 11 Apr 2024 10:32:41 -0400 Subject: [PATCH 6/6] Fix yaml try3 --- .github/workflows/push-to-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-to-develop.yml b/.github/workflows/push-to-develop.yml index 36bb7c0c3378..449820dd235a 100644 --- a/.github/workflows/push-to-develop.yml +++ b/.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: ":chart_with_upwards_trend: MAPL3", "Changelog Skip", ":wrench: Github Actions" + 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