ci(release-please, chromatic): add support for hotfixes

Esri · May 10, 2024 · 2d64cd1 · 2d64cd1
1 parent 1ad530e
commit 2d64cd1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/chromatic-main.yml → .github/workflows/chromatic.yml b/.github/workflows/chromatic-main.yml → .github/workflows/chromatic.yml
@@ -1,9 +1,9 @@
-name: "Chromatic - Main"
+name: Chromatic
 on:
   push:
-    branches: [main]
+    branches: [main, hotfix, rc]
   pull_request:
-    branches: [main]
+    branches: [main, hotfix, rc]
     types: [labeled, synchronize]
 jobs:
   run:
@@ -25,7 +25,7 @@ jobs:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           zip: true
           exitOnceUploaded: true
-          autoAcceptChanges: main
+          autoAcceptChanges: ${{ github.head_ref || github.ref_name }}
           workingDir: packages/calcite-components
         env:
           STORYBOOK_SCREENSHOT_TEST_BUILD: true

diff --git a/.github/workflows/deploy-latest.yml b/.github/workflows/deploy-latest.yml
@@ -2,7 +2,7 @@ name: Deploy Latest
 on:
   workflow_dispatch:
   push:
-    branches: [main]
+    branches: [main, hotfix]
 permissions:
   contents: write
   pull-requests: write
@@ -15,7 +15,7 @@ jobs:
         with:
           command: manifest
           token: ${{ secrets.ADMIN_TOKEN }}
-          default-branch: main
+          default-branch: ${{ github.ref_name }}
           extra-files: |
             packages/calcite-components/readme.md
       - name: Checkout Repository
@@ -24,7 +24,6 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.ADMIN_TOKEN }}
-          ref: main
       - name: Setup Node
         if: ${{ steps.release.outputs.releases_created }}
         uses: actions/setup-node@v4