From 6813309397ac77c409b85e57adca3660b0e003e8 Mon Sep 17 00:00:00 2001 From: tomiir Date: Wed, 12 Jun 2024 10:28:15 -0600 Subject: [PATCH 1/4] chore: change configs to use main and V5 --- .changeset/config.json | 2 +- .github/workflows/pr_checks.yml | 2 ++ .github/workflows/publish_canary.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/ui_tests.yml | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.changeset/config.json b/.changeset/config.json index 22541f7b38..3fd7268edc 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -5,7 +5,7 @@ "fixed": [], "linked": [], "access": "public", - "baseBranch": "V4", + "baseBranch": "V5", "updateInternalDependencies": "patch", "ignore": [] } diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml index 43db3bf9f7..9b3e438673 100644 --- a/.github/workflows/pr_checks.yml +++ b/.github/workflows/pr_checks.yml @@ -5,6 +5,8 @@ on: branches: - V3 - V4 + - V5 + - main concurrency: # Support push/pr as event types with different behaviors each: diff --git a/.github/workflows/publish_canary.yml b/.github/workflows/publish_canary.yml index da60c1c7e8..27b930c29f 100644 --- a/.github/workflows/publish_canary.yml +++ b/.github/workflows/publish_canary.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: push: branches: - - V4 + - V5 concurrency: ${{ github.workflow }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e999c953a0..881b18e0ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Release on: push: branches: - - V4 + - V5 concurrency: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/ui_tests.yml b/.github/workflows/ui_tests.yml index 70dc541399..84fa988d43 100644 --- a/.github/workflows/ui_tests.yml +++ b/.github/workflows/ui_tests.yml @@ -5,7 +5,7 @@ on: inputs: branch: description: 'The branch to use' - default: 'V3' + default: 'V5' required: false type: string base-url: From a44d4326efeafe354ede796827231fb9195bb2bd Mon Sep 17 00:00:00 2001 From: tomiir Date: Wed, 12 Jun 2024 10:31:14 -0600 Subject: [PATCH 2/4] chore: set changesets config to main --- .changeset/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/config.json b/.changeset/config.json index 3fd7268edc..e5f7429d6b 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -5,7 +5,7 @@ "fixed": [], "linked": [], "access": "public", - "baseBranch": "V5", + "baseBranch": "main", "updateInternalDependencies": "patch", "ignore": [] } From 17c30c8b8b7f731ac36dbc66c0593ed35f89c616 Mon Sep 17 00:00:00 2001 From: tomiir Date: Wed, 12 Jun 2024 10:40:54 -0600 Subject: [PATCH 3/4] fix: set canary to main --- .github/workflows/publish_canary.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish_canary.yml b/.github/workflows/publish_canary.yml index 27b930c29f..f32d14503e 100644 --- a/.github/workflows/publish_canary.yml +++ b/.github/workflows/publish_canary.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: push: branches: - - V5 + - main concurrency: ${{ github.workflow }} From 5114156ca26a9050745dfc6ca3efb9f72329d738 Mon Sep 17 00:00:00 2001 From: tomiir Date: Wed, 12 Jun 2024 10:41:52 -0600 Subject: [PATCH 4/4] fix: set default for workflow call to main --- .github/workflows/ui_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ui_tests.yml b/.github/workflows/ui_tests.yml index 84fa988d43..057f0ee912 100644 --- a/.github/workflows/ui_tests.yml +++ b/.github/workflows/ui_tests.yml @@ -5,7 +5,7 @@ on: inputs: branch: description: 'The branch to use' - default: 'V5' + default: 'main' required: false type: string base-url: