From 7163ffc1d29efb00a9c5644a032a79bc20746689 Mon Sep 17 00:00:00 2001
From: Alec Aivazis <alec@aivazis.com>
Date: Sat, 7 Oct 2023 23:03:28 -0700
Subject: [PATCH] distinguish between canary-main and canary-next

---
 .github/workflows/{nightly.yml => canary.yml} | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 rename .github/workflows/{nightly.yml => canary.yml} (84%)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/canary.yml
similarity index 84%
rename from .github/workflows/nightly.yml
rename to .github/workflows/canary.yml
index 2661878de..37024036e 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/canary.yml
@@ -1,4 +1,4 @@
-name: Nightly Release
+name: Canary Release
 
 # on every commit to main, we want to publish a snapshot release:
 # for more info: https://github.com/changesets/changesets/blob/main/docs/snapshot-releases.md
@@ -11,7 +11,7 @@ env:
     CI: true
 jobs:
     publish:
-        name: Publish Nightly Version
+        name: Publish Canary Version
         runs-on: ubuntu-22.04
         steps:
             - name: Creating .npmrc
@@ -57,4 +57,10 @@ jobs:
               run: |
                   pnpm changeset version --snapshot
                   pnpm run build
+<<<<<<< Updated upstream:.github/workflows/nightly.yml
                   pnpm changeset publish --no-git-tag --snapshot --tag nightly
+=======
+                  pnpm changeset publish --no-git-tag --snapshot --tag canary-${GITHUB_BASE_REF}
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+>>>>>>> Stashed changes:.github/workflows/canary.yml