Merge pull request #161 from RooVetGit/chores/changeset-pr-merge

Changeset pr manual merge

.changeset/changelog-config.js

@@ -10,9 +10,14 @@ const getDependencyReleaseLine = async () => {
   return '';
 };
 
+const getReleaseSummary = async (release) => {
+  return `## [${release.newVersion}]\n\n`;
+};
+
 const changelogFunctions = {
   getReleaseLine,
   getDependencyReleaseLine,
+  getReleaseSummary,
 };
 
 module.exports = changelogFunctions;

.github/workflows/changeset-release.yml

@@ -1,5 +1,5 @@
 name: Changeset Release
-run-name: Changeset Release ${{ github.actor != 'R00-B0T' && '- Create PR' || '- Approve & Merge' }}
+run-name: Changeset Release ${{ github.actor != 'R00-B0T' && '- Create PR' || '- Ready for Review' }}
 
 on:
   pull_request:
@@ -69,7 +69,6 @@ jobs:
         github.event.pull_request.base.ref == 'main' &&
         github.actor == 'R00-B0T' &&
         contains(github.event.pull_request.title, 'Changeset version bump')
-    
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -77,15 +76,15 @@ jobs:
           token: ${{ secrets.CROSS_REPO_ACCESS_TOKEN }}
           fetch-depth: 0
           ref: ${{ env.GIT_REF }}
-
       # Auto-approve PR
       - name: Auto approve PR
         uses: hmarr/auto-approve-action@v4
         with:
           review-message: "I'm approving since it's a bump version PR"
       
-      # Enable auto-merge for the PR
-      - name: Enable automerge on PR
-        run: gh pr merge --merge --auto ${{ github.event.pull_request.number }}
+      # Auto-merge PR
+      - name: Automerge on PR
+        if: false # Needs enablePullRequestAutoMerge in repo settings to work
+        run: gh pr merge --auto --merge ${{ github.event.pull_request.number }}
         env:
           GH_TOKEN: ${{ secrets.CROSS_REPO_ACCESS_TOKEN }}

.github/workflows/marketplace-publish.yml

@@ -1,16 +1,26 @@
 name: Publish Extension
 on:
-  push:
-    branches: ["main"]
+  pull_request:
+    types: [closed]
   workflow_dispatch:
 
+env:
+  GIT_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'main' }}
+
 jobs:
   publish-extension:
     runs-on: ubuntu-latest
-    if: ${{ github.actor == 'R00-B0T' || github.event_name == 'workflow_dispatch' }}
+    if: >
+        ( github.event_name == 'pull_request' &&
+        github.event.pull_request.base.ref == 'main' &&
+        contains(github.event.pull_request.title, 'Changeset version bump') ) ||
+        github.event_name == 'workflow_dispatch'
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GIT_REF }}
+
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
       - run: |

CHANGELOG.md

@@ -1,8 +1,6 @@
 # Roo Cline Changelog
 
-## 2.2.17
-
-### Patch Changes
+## [2.2.17]
 
 -   Improved regex for auto-execution of chained commands