From 8da77e5f25571057693b0b2a2dc1c9b5c8cc0307 Mon Sep 17 00:00:00 2001 From: bookernath Date: Mon, 6 Jan 2025 19:07:02 -0600 Subject: [PATCH 1/2] Update references to `main` with `canary` in CI --- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/workflows/basic.yml | 2 +- .github/workflows/changesets-release.yml | 2 +- .github/workflows/translations-changeset.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 86c1f37310..9033d93b59 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Have questions? - url: https://github.com/bigcommerce/catalyst/blob/main/README.md + url: https://github.com/bigcommerce/catalyst/blob/canary/README.md about: Explore the Catalyst Docs. - name: Need help with Catalyst? url: https://github.com/bigcommerce/catalyst/discussions/new?category=q-a diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 965c030e6e..1a066e6f80 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -2,7 +2,7 @@ name: Basic on: push: - branches: [main] + branches: [canary] pull_request: types: [opened, synchronize] merge_group: diff --git a/.github/workflows/changesets-release.yml b/.github/workflows/changesets-release.yml index 2f6f7f6938..f56e214f16 100644 --- a/.github/workflows/changesets-release.yml +++ b/.github/workflows/changesets-release.yml @@ -3,7 +3,7 @@ name: Changesets Release on: push: branches: - - main + - canary concurrency: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/translations-changeset.yml b/.github/workflows/translations-changeset.yml index 84cacf3a50..8422a1e1ac 100644 --- a/.github/workflows/translations-changeset.yml +++ b/.github/workflows/translations-changeset.yml @@ -5,7 +5,7 @@ on: types: - opened branches: - - main + - canary jobs: create-translations-patch: From b24da5f1d4ecd581cf785c1fa5a24199b4ecdc3c Mon Sep 17 00:00:00 2001 From: bookernath Date: Mon, 6 Jan 2025 19:16:49 -0600 Subject: [PATCH 2/2] Change baseBranch to canary for changesets --- .changeset/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/config.json b/.changeset/config.json index 6a36474769..6e6e393892 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -11,7 +11,7 @@ "version": true, "tag": true }, - "baseBranch": "main", + "baseBranch": "canary", "updateInternalDependencies": "patch", "ignore": [] }