Fix v6 release workflow branch targeting

Author: mcollina

.github/workflows/release-create-pr.yml

@@ -31,6 +31,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Validate release branch
+        run: |
+          if [ "${{ github.ref_name }}" != "v6.x" ]; then
+            echo "This workflow must run from v6.x (current ref: ${{ github.ref_name }})."
+            exit 1
+          fi
       - uses: actions/setup-node@v4
         with:
           node-version: '20'
@@ -52,6 +58,6 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const defaultBranch = "${{ github.event.repository.default_branch }}"
+            const releaseBranch = "${{ github.ref_name }}"
             const versionTag = "v${{ steps.bump.outputs.version }}"
-            await require('./scripts/release').generatePr({ github, context, defaultBranch, versionTag })
+            await require('./scripts/release').generatePr({ github, context, releaseBranch, versionTag })

.github/workflows/release.yml

@@ -3,8 +3,7 @@ name: Create release
 on:
   push:
     branches:
-     - main
-     - v6.x
+      - v6.x
     paths:
       - package.json
 
@@ -41,7 +40,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     needs: check-release-version
-    if: ${{ startsWith(needs.check-release-version.outputs.release-version, 'v') }}
+    if: ${{ github.ref_name == 'v6.x' && startsWith(needs.check-release-version.outputs.release-version, 'v') }}
 
     permissions:
       contents: write
@@ -66,6 +65,6 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const defaultBranch = "${{ github.event.repository.default_branch }}"
+            const releaseBranch = "${{ github.ref_name }}"
             const versionTag = "${{ needs.check-release-version.outputs.release-version }}"
-            await require('./scripts/release').release({ github, context, defaultBranch, versionTag })
+            await require('./scripts/release').release({ github, context, releaseBranch, versionTag })

scripts/release.js

@@ -2,7 +2,7 @@
 
 // Called from .github/workflows
 
-const generateReleaseNotes = async ({ github, owner, repo, versionTag, defaultBranch }) => {
+const generateReleaseNotes = async ({ github, owner, repo, versionTag, releaseBranch }) => {
   const { data: releases } = await github.rest.repos.listReleases({
     owner,
     repo
@@ -14,7 +14,7 @@ const generateReleaseNotes = async ({ github, owner, repo, versionTag, defaultBr
     owner,
     repo,
     tag_name: versionTag,
-    target_commitish: defaultBranch,
+    target_commitish: releaseBranch,
     previous_tag_name: previousRelease?.tag_name
   })
 
@@ -25,29 +25,29 @@ const generateReleaseNotes = async ({ github, owner, repo, versionTag, defaultBr
   return bodyWithoutReleasePr
 }
 
-const generatePr = async ({ github, context, defaultBranch, versionTag }) => {
+const generatePr = async ({ github, context, releaseBranch, versionTag }) => {
   const { owner, repo } = context.repo
-  const releaseNotes = await generateReleaseNotes({ github, owner, repo, versionTag, defaultBranch })
+  const releaseNotes = await generateReleaseNotes({ github, owner, repo, versionTag, releaseBranch })
 
   await github.rest.pulls.create({
     owner,
     repo,
     head: `release/${versionTag}`,
-    base: defaultBranch,
+    base: releaseBranch,
     title: `[Release] ${versionTag}`,
     body: releaseNotes
   })
 }
 
-const release = async ({ github, context, defaultBranch, versionTag }) => {
+const release = async ({ github, context, releaseBranch, versionTag }) => {
   const { owner, repo } = context.repo
-  const releaseNotes = await generateReleaseNotes({ github, owner, repo, versionTag, defaultBranch })
+  const releaseNotes = await generateReleaseNotes({ github, owner, repo, versionTag, releaseBranch })
 
   await github.rest.repos.createRelease({
     owner,
     repo,
     tag_name: versionTag,
-    target_commitish: defaultBranch,
+    target_commitish: releaseBranch,
     name: versionTag,
     body: releaseNotes,
     draft: false,