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