diff --git a/.drevops/tests/bats/_helper.bash b/.drevops/tests/bats/_helper.bash index de3813bdd..a07cb84a5 100644 --- a/.drevops/tests/bats/_helper.bash +++ b/.drevops/tests/bats/_helper.bash @@ -246,9 +246,6 @@ assert_files_present_common() { assert_files_present_drupal "${dir}" "${suffix}" "${suffix_abbreviated}" "${suffix_abbreviated_camel_cased}" "${suffix_camel_cased}" "${webroot}" - # Assert that PR template was processed - assert_file_contains ".github/PULL_REQUEST_TEMPLATE.md" "[${suffix_abbreviated_uppercase}-123] Verb in past tense with dot at the end." - popd >/dev/null || exit 1 } diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9ba0cc998..95cbae23b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ ## Checklist before requesting a review -- [ ] I have formatted the subject to include ticket number as `[YSCODE-123] Verb in past tense with dot at the end.` +- [ ] I have formatted the subject to include ticket number as `[#123] Verb in past tense with dot at the end.` - [ ] I have added a link to the issue tracker - [ ] I have provided information in `Changed` section about WHY something was done if this was not a normal implementation - [ ] I have performed a self-review of my code diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 699ff479c..8b0738371 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,12 +1,14 @@ -name-template: '$NEXT_MINOR_VERSION' -tag-template: '$NEXT_MINOR_VERSION' +name-template: '$RESOLVED_VERSION' +tag-template: '$RESOLVED_VERSION' change-template: '- $TITLE @$AUTHOR (#$NUMBER)' change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. +version-resolver: + default: minor template: | ## What's new since $PREVIOUS_TAG $CHANGES - **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...$NEXT_MINOR_VERSION + **Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...$RESOLVED_VERSION $CONTRIBUTORS diff --git a/.github/workflows/auto-assign-pr-author.yml b/.github/workflows/assign-author.yml similarity index 55% rename from .github/workflows/auto-assign-pr-author.yml rename to .github/workflows/assign-author.yml index 7eb28037a..0fa1be9b9 100644 --- a/.github/workflows/auto-assign-pr-author.yml +++ b/.github/workflows/assign-author.yml @@ -2,7 +2,9 @@ name: 'Auto Author Assign' on: pull_request_target: - types: [opened, reopened] + types: + - opened + - reopened permissions: pull-requests: write @@ -10,5 +12,7 @@ permissions: jobs: assign-author: runs-on: ubuntu-latest + steps: - - uses: toshimaru/auto-author-assign@v2.0.1 + - name: Assign author + uses: toshimaru/auto-author-assign@v2.0.1 diff --git a/.github/workflows/release.yml b/.github/workflows/draft-release-notes.yml similarity index 72% rename from .github/workflows/release.yml rename to .github/workflows/draft-release-notes.yml index bd1c2ebb6..5f25a8781 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/draft-release-notes.yml @@ -1,4 +1,4 @@ -name: Release +name: Draft release notes on: push: @@ -15,8 +15,11 @@ jobs: permissions: contents: write pull-requests: write + runs-on: ubuntu-latest + steps: - - uses: release-drafter/release-drafter@v5 + - name: Draft release notes + uses: release-drafter/release-drafter@v5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/auto-label-conflict.yml b/.github/workflows/label-merge-conflict.yml similarity index 92% rename from .github/workflows/auto-label-conflict.yml rename to .github/workflows/label-merge-conflict.yml index 6b92dca86..edbf7defd 100644 --- a/.github/workflows/auto-label-conflict.yml +++ b/.github/workflows/label-merge-conflict.yml @@ -1,8 +1,10 @@ name: "Auto-label a PR with a conflict" + on: push: pull_request_target: - types: [synchronize] + types: + - synchronize jobs: main: