ci: additional changes to support hotfixes

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

Hide file tree

Showing 6 changed files with 6 additions and 50 deletions.
diff --git a/.github/workflows/chromatic-rc.yml b/.github/workflows/chromatic-rc.yml
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
@@ -25,7 +25,7 @@ jobs:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           zip: true
           exitOnceUploaded: true
-          autoAcceptChanges: ${{ github.head_ref || github.ref_name }}
+          autoAcceptChanges: ${{ github.base_ref || github.ref_name }}
           workingDir: packages/calcite-components
         env:
           STORYBOOK_SCREENSHOT_TEST_BUILD: true

diff --git a/.github/workflows/pr-bot.yml b/.github/workflows/pr-bot.yml
@@ -1,7 +1,7 @@
 name: PR Bot
 on:
   pull_request:
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
 permissions:
   pull-requests: write
   issues: write

diff --git a/.github/workflows/pr-e2e.yml b/.github/workflows/pr-e2e.yml
@@ -2,7 +2,7 @@ name: E2E
 on:
   workflow_dispatch:
   pull_request:
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
 jobs:
   e2e:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/pr-milestone.yml b/.github/workflows/pr-milestone.yml
@@ -1,7 +1,7 @@
 name: PR Merged
 on:
   pull_request:
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
     types: [closed]
 jobs:
   milestone:

diff --git a/.github/workflows/pr-tests_eslint-plugin-calcite-components.yml b/.github/workflows/pr-tests_eslint-plugin-calcite-components.yml
@@ -3,10 +3,10 @@ name: Run eslint-plugin-calcite-components tests
 on:
   pull_request:
     paths: ["packages/eslint-plugin-calcite-components/**"]
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
   push:
     paths: ["packages/eslint-plugin-calcite-components/**"]
-    branches: [main, rc]
+    branches: [main, rc, hotfix]
 
 jobs:
   build: