From 1008501b289d0f891a9c1a533d45bebcfb927404 Mon Sep 17 00:00:00 2001 From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:50:51 +0100 Subject: [PATCH 1/3] Remove changelog checklist item from release process Changelog entries are already a per-PR checklist item. GH Actions automatically sets changelog release date during release. --- stage-1/create-release-pr/create-release-pr.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/stage-1/create-release-pr/create-release-pr.js b/stage-1/create-release-pr/create-release-pr.js index e1f64ee..e450a27 100644 --- a/stage-1/create-release-pr/create-release-pr.js +++ b/stage-1/create-release-pr/create-release-pr.js @@ -55,9 +55,6 @@ ${workflowBadges ? `- Tests last run on \`${env.BASE_REF}\`:\n ${workflowBadg #### Checklist: - ${milestoneText()} -- [ ] Changelog up-to-date? - - Examine pull requests made since the last release - - "Released on" date updated? ${env.CHANGELOG_DATE ? `✔️ \`${env.CHANGELOG_DATE}\`` : `⚠️ couldn't automatically set date`} #### Next steps: - @${author} should request 1 or 2 reviews From cd269eb7ae4dc9a357b9ea334034d0ea6d37cb65 Mon Sep 17 00:00:00 2001 From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> Date: Thu, 4 Jul 2024 15:51:22 +0100 Subject: [PATCH 2/3] Use markdown admonition for better visibility --- .github/workflows/branch-sync.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/branch-sync.yml b/.github/workflows/branch-sync.yml index 2d76bd2..080a60a 100644 --- a/.github/workflows/branch-sync.yml +++ b/.github/workflows/branch-sync.yml @@ -102,7 +102,9 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BODY: | - Please do a **normal merge**, not squash merge. + > [!IMPORTANT] + > Please do a **normal merge**, not squash merge. + Please fix conflicts if necessary. --- From 27103240c58c14664556697fd75a0d75c2ca61d3 Mon Sep 17 00:00:00 2001 From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> Date: Thu, 4 Jul 2024 16:00:08 +0100 Subject: [PATCH 3/3] Add different PR template for this repo --- .github/PULL_REQUEST_TEMPLATE.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..3b5fc92 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,7 @@ +#### Description + + + +#### Checklist + +- [ ] I have read the contributing instructions in `README.md` and have opened this against the correct branch & milestone