From 674e45b7d93d241f9b60718c6d344e5e13d4e4fc Mon Sep 17 00:00:00 2001 From: "tan.nguyen" Date: Mon, 19 Feb 2024 10:43:52 +0700 Subject: [PATCH 1/3] Update to scaffold 0.12.0 --- .github/PULL_REQUEST_TEMPLATE.md | 19 +++++++++++++++++++ .github/release-drafter.yml | 6 ++++-- ...assign-pr-author.yml => assign-author.yml} | 4 +++- .../{release.yml => draft-release-notes.yml} | 10 +++++++--- 4 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md rename .github/workflows/{auto-assign-pr-author.yml => assign-author.yml} (71%) rename .github/workflows/{release.yml => draft-release-notes.yml} (76%) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..7c34e35 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,19 @@ +## Checklist before requesting a review + +- [ ] 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 +- [ ] I have commented my code, particularly in hard-to-understand areas +- [ ] I have added tests that prove my fix is effective or that my feature works +- [ ] I have run new and existing relevant tests locally with my changes, and + they passed +- [ ] I have provided screenshots, where applicable + +## Changed + +1. + +## Screenshots diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index a6783c8..8b07383 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,7 +1,9 @@ -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 diff --git a/.github/workflows/auto-assign-pr-author.yml b/.github/workflows/assign-author.yml similarity index 71% rename from .github/workflows/auto-assign-pr-author.yml rename to .github/workflows/assign-author.yml index df73ac4..0fa1be9 100644 --- a/.github/workflows/auto-assign-pr-author.yml +++ b/.github/workflows/assign-author.yml @@ -12,5 +12,7 @@ permissions: jobs: assign-author: runs-on: ubuntu-latest + steps: - - uses: toshimaru/auto-author-assign@v2.1.0 + - 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 76% rename from .github/workflows/release.yml rename to .github/workflows/draft-release-notes.yml index 8042a76..b068fba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/draft-release-notes.yml @@ -15,15 +15,19 @@ jobs: permissions: contents: write pull-requests: write + runs-on: ubuntu-latest + steps: - name: Generate CalVer version id: calver run: | - export VERSION="$(date "+%y.%-m").0" - echo "version=${VERSION}" >> $GITHUB_OUTPUT + export VERSION="$(date "+%y.%-m").0" + echo "version=${VERSION}" >> $GITHUB_OUTPUT echo "Version set to ${VERSION}" - - uses: release-drafter/release-drafter@v6 + + - name: Draft release notes + uses: release-drafter/release-drafter@v6 with: tag: ${{ steps.calver.outputs.version }} name: ${{ steps.calver.outputs.version }} From da07b54c0c157c9e2b24002aea15a9c55aea21f7 Mon Sep 17 00:00:00 2001 From: "tan.nguyen" Date: Mon, 19 Feb 2024 10:51:10 +0700 Subject: [PATCH 2/3] Update to scaffold 0.12.1. --- .github/PULL_REQUEST_TEMPLATE.md | 9 +++------ .github/workflows/assign-author.yml | 2 +- .github/workflows/draft-release-notes.yml | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7c34e35..95cbae2 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,15 +1,12 @@ ## Checklist before requesting a review -- [ ] I have formatted the subject to include ticket number - as `[#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 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 - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added tests that prove my fix is effective or that my feature works -- [ ] I have run new and existing relevant tests locally with my changes, and - they passed +- [ ] I have run new and existing relevant tests locally with my changes, and they passed - [ ] I have provided screenshots, where applicable ## Changed diff --git a/.github/workflows/assign-author.yml b/.github/workflows/assign-author.yml index 0fa1be9..466655f 100644 --- a/.github/workflows/assign-author.yml +++ b/.github/workflows/assign-author.yml @@ -15,4 +15,4 @@ jobs: steps: - name: Assign author - uses: toshimaru/auto-author-assign@v2.0.1 + uses: toshimaru/auto-author-assign@v2.1.0 diff --git a/.github/workflows/draft-release-notes.yml b/.github/workflows/draft-release-notes.yml index b068fba..6b257cf 100644 --- a/.github/workflows/draft-release-notes.yml +++ b/.github/workflows/draft-release-notes.yml @@ -1,4 +1,4 @@ -name: Release +name: Draft release notes on: push: From 4942e6e603c7c012bceb3f2a7e10087d4dcf44ef Mon Sep 17 00:00:00 2001 From: "tan.nguyen" Date: Mon, 19 Feb 2024 10:54:03 +0700 Subject: [PATCH 3/3] Update renovate. --- renovate.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 22abcdf..6b17881 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,10 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "dependencyDashboard": true, "automerge": true, + "dependencyDashboard": true, + "extends": [ + "config:base" + ], "regexManagers": [ { "fileMatch": [