restore main's separate release config

Author: ef4

.github/workflows/plan-release.yml

@@ -2,18 +2,19 @@ name: Release Plan Review
 on:
   push:
     branches:
-      - 2.x
+      - main
+      - master
   pull_request:
     types:
       - labeled
 
 concurrency:
-  group: plan-release-2.x # only the latest one of these should ever be running
+  group: plan-release # only the latest one of these should ever be running
   cancel-in-progress: true
 
 jobs:
   check-plan:
-    name: 'Check Release Plan'
+    name: "Check Release Plan"
     runs-on: ubuntu-latest
     outputs:
       command: ${{ steps.check-release.outputs.command }}
@@ -22,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: '2.x'
+          ref: 'main'
       # This will only cause the `check-plan` job to have a "command" of `release`
       # when the .release-plan.json file was changed on the last commit.
       - id: check-release
@@ -48,21 +49,21 @@ jobs:
         # github-changelog can discover what's changed since the last release
         with:
           fetch-depth: 0
-          ref: '2.x'
+          ref: 'main'
       - uses: actions/setup-node@v4
         with:
           node-version: 18
-
+      
       - uses: pnpm/action-setup@v3
       - run: pnpm install --frozen-lockfile
-
-      - name: 'Generate Explanation and Prep Changelogs'
+      
+      - name: "Generate Explanation and Prep Changelogs"
         id: explanation
         run: |
           set +e
-
+          
           pnpm release-plan prepare 2> >(tee -a stderr.log >&2)
-
+          
 
           if [ $? -ne 0 ]; then
             echo 'text<<EOF' >> $GITHUB_OUTPUT
@@ -79,9 +80,9 @@ jobs:
       - uses: peter-evans/create-pull-request@v6
         with:
           commit-message: "Prepare Release using 'release-plan'"
-          labels: 'internal'
-          branch: release-preview-2.x
-          title: Prepare Release (2.x)
+          labels: "internal"
+          branch: release-preview
+          title: Prepare Release
           body: |
             This PR is a preview of the release that [release-plan](https://github.com/embroider-build/release-plan) has prepared. To release you should just merge this PR 👍
 

.github/workflows/publish.yml

@@ -2,21 +2,22 @@
 # updated and if it was it will publish stable npm packages based on the
 # release plan
 
-name: Publish Stable (2.x)
+name: Publish Stable
 
 on:
   workflow_dispatch:
   push:
     branches:
-      - 2.x
+      - main
+      - master
 
 concurrency:
-  group: publish-2.x-${{ github.head_ref || github.ref }}
+  group: publish-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
 
 jobs:
   check-plan:
-    name: 'Check Release Plan'
+    name: "Check Release Plan"
     runs-on: ubuntu-latest
     outputs:
       command: ${{ steps.check-release.outputs.command }}
@@ -25,15 +26,15 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          ref: '2.x'
+          ref: 'main'
       # This will only cause the `check-plan` job to have a result of `success`
       # when the .release-plan.json file was changed on the last commit. This
       # plus the fact that this action only runs on main will be enough of a guard
       - id: check-release
         run: if git diff --name-only HEAD HEAD~1 | grep -w -q ".release-plan.json"; then echo "command=release"; fi >> $GITHUB_OUTPUT
 
   publish:
-    name: 'NPM Publish'
+    name: "NPM Publish"
     runs-on: ubuntu-latest
     needs: check-plan
     if: needs.check-plan.outputs.command == 'release'
@@ -48,12 +49,12 @@ jobs:
           node-version: 18
           # This creates an .npmrc that reads the NODE_AUTH_TOKEN environment variable
           registry-url: 'https://registry.npmjs.org'
-
+      
       - uses: pnpm/action-setup@v3
       - run: pnpm install --frozen-lockfile
       - name: npm publish
-        run: pnpm release-plan publish --publish-branch=2.x
-
+        run: pnpm release-plan publish
+      
         env:
           GITHUB_AUTH: ${{ secrets.GITHUB_TOKEN }}
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}