From f0a8cb654185de1298b2a2d66864154181fa7dd6 Mon Sep 17 00:00:00 2001
From: jcheng2021 <jcheng@teldio.com>
Date: Fri, 16 Dec 2022 19:26:01 -0500
Subject: [PATCH] fix: release branch flow

---
 .github/workflows/checkPullRequest.yml |  4 ++--
 .github/workflows/release.yml          | 27 --------------------------
 .github/workflows/testRelease.yml      | 17 ++++------------
 3 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/checkPullRequest.yml b/.github/workflows/checkPullRequest.yml
index 3c3c1b4..31ecae8 100644
--- a/.github/workflows/checkPullRequest.yml
+++ b/.github/workflows/checkPullRequest.yml
@@ -3,7 +3,7 @@ name: Check Pull Request
 on:
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   release:
@@ -16,7 +16,7 @@ jobs:
       - name: Semantic Release
         uses: ./
         with:
-          branch: master
+          branch: main
           extra_plugins: |
             @semantic-release/git
             @semantic-release/changelog
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f56c019..e9fae52 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,10 +5,6 @@ on:
     branches:
       - release
       - master
-      - next
-      - next-major
-      - alpha
-      - beta
 
 jobs:
   release:
@@ -27,16 +23,6 @@ jobs:
               '+([0-9])?(.{+([0-9]),x}).x',
               'release',
               'master',
-              'next',
-              'next-major',
-              {
-                name: 'beta',
-                prerelease: true
-              },
-              {
-                name: 'alpha',
-                prerelease: true
-              }
             ]
           extra_plugins: |
             @semantic-release/git
@@ -45,19 +31,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      - name: Setup Node.js with GitHub Package Registry
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          registry-url: 'https://npm.pkg.github.com'
-          scope: 'cycjimmy'
-
-      - name: Publish To GitHub Package Registry
-        if: steps.semantic.outputs.new_release_published == 'true'
-        run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
-
       - name: Push updates to branch for major version
         if: steps.semantic.outputs.new_release_published == 'true'
         run: "git push https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git HEAD:refs/heads/v${{steps.semantic.outputs.new_release_major_version}}"
diff --git a/.github/workflows/testRelease.yml b/.github/workflows/testRelease.yml
index 92573f4..186640d 100644
--- a/.github/workflows/testRelease.yml
+++ b/.github/workflows/testRelease.yml
@@ -3,7 +3,7 @@ name: Test Release
 on:
   pull_request:
     branches:
-      - master
+      - release
       - main
   push:
 
@@ -26,18 +26,8 @@ jobs:
           branches: |
             [
               '+([0-9])?(.{+([0-9]),x}).x',
-              'master',
-              'main',
-              'next',
-              'next-major',
-              {
-                name: 'beta',
-                prerelease: true
-              },
-              {
-                name: 'alpha',
-                prerelease: true
-              }
+              'release',
+              'main'
             ]
           extra_plugins: |
             @semantic-release/git
@@ -69,6 +59,7 @@ jobs:
           dry_run: true
           branches: |
             [
+              'release',
               'main',
               {name: 'beta', prerelease: true},
               {name: 'alpha', prerelease: true}