From 6e5d5e718626c865c1a36a174d23e70186400c23 Mon Sep 17 00:00:00 2001 From: Chris Manson Date: Tue, 5 Dec 2023 15:04:23 +0000 Subject: [PATCH] reset main branch references --- .github/workflows/ci.yml | 4 ++-- .github/workflows/publish-stable.yml | 4 ++-- .github/workflows/release-plan-preview.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c6014b3d..90e93f48f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,12 +10,12 @@ on: push: branches: - - stable + - main - 'v[0-9]+*' # prior release branches (e.g. `v0.30.x` branch) tags: - 'v*' pull_request: - branches: [stable] + branches: [main] concurrency: group: ci-${{ github.head_ref || github.ref }} diff --git a/.github/workflows/publish-stable.yml b/.github/workflows/publish-stable.yml index de23c3fa3..14e60ff47 100644 --- a/.github/workflows/publish-stable.yml +++ b/.github/workflows/publish-stable.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: push: branches: - - stable + - main concurrency: group: publish-stable-${{ github.head_ref || github.ref }} @@ -25,7 +25,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - ref: 'stable' + ref: 'main' # This will only cause the `check-plan` job to have a result of `success` # when the .release-plan.json file was changed on the last commit. This # plus the fact that this action only runs on main will be enough of a guard diff --git a/.github/workflows/release-plan-preview.yml b/.github/workflows/release-plan-preview.yml index 71682c371..6ec4b8007 100644 --- a/.github/workflows/release-plan-preview.yml +++ b/.github/workflows/release-plan-preview.yml @@ -2,7 +2,7 @@ name: Release Plan Review on: push: branches: - - stable + - main pull_request: types: - labeled @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - ref: 'stable' + ref: 'main' # This will only cause the `check-plan` job to have a "command" of `release` # when the .release-plan.json file was changed on the last commit. - id: check-release @@ -67,7 +67,7 @@ jobs: commit-message: "Prepare Release using 'release-plan'" author: "github-actions[bot] " labels: "internal" - branch: release-preview-stable + branch: release-preview title: Prepare Release body: | This PR is a preview of the release that [release-plan](https://github.com/embroider-build/release-plan) has prepared. To release you should just merge this PR 👍