From e0b89262c87424b778a9151ee8176835fc740fdb Mon Sep 17 00:00:00 2001
From: Michael Winter <36558508+mcwinter07@users.noreply.github.com>
Date: Fri, 4 Aug 2023 15:00:47 +1000
Subject: [PATCH] add canary prefix, push tags and clean up steps (#3957)

* add canary prefix, push tags and clean up steps

* remove uneeded outputs config
---
 .github/workflows/canary-release.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/canary-release.yml b/.github/workflows/canary-release.yml
index 95db8a2f848..74b5032e11a 100644
--- a/.github/workflows/canary-release.yml
+++ b/.github/workflows/canary-release.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       label:
-        description: 'Pick a label for the release, to be included in the version number — e.g. "fix-button-focus" will released as "@kaizen/button@1.0.0-fix-button-focus-20230719002814"'
+        description: 'Pick a label for the release, to be included in the version number — e.g. "fix-button-focus" will released as "@kaizen/button@0.0.0-canary-fix-button-focus-20230719002814"'
         required: true
         type: string
 
@@ -18,12 +18,17 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
-      - name: Create Release Pull Request or Publish to npm
-        id: changesets
+      - name: Set npm token
         run: |
           npm config set "//registry.npmjs.org/:_authToken" "$NPM_TOKEN"
-      - run: |
-          echo "Releasing canary for $LABEL"
+      - name: Create canary release and publish to npm
+        id: changesets
+        run: |
+          echo "🥚 Building canary-$LABEL"
           yarn build
-          yarn changeset version --snapshot "$LABEL"
-          yarn changeset publish --tag "$LABEL"
+          echo "🐣 Releasing canary-$LABEL"
+          yarn changeset version --snapshot "canary-$LABEL"
+          yarn changeset publish --tag "canary-$LABEL"
+      - name: Push tags
+        run: |
+          git push --follow-tags