From 3a62f9ed29365f4622e7d22bcda1a2cea6b980e8 Mon Sep 17 00:00:00 2001 From: Brian Smith <112954497+brian-smith-tcril@users.noreply.github.com> Date: Wed, 11 Dec 2024 17:55:19 -0500 Subject: [PATCH] chore: update gh actions workflows for new branching strategy (#3342) --- .github/workflows/lockfileversion-check.yml | 3 ++- .github/workflows/release.yml | 3 ++- .github/workflows/sync-master-alpha.yml | 30 --------------------- 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 .github/workflows/sync-master-alpha.yml diff --git a/.github/workflows/lockfileversion-check.yml b/.github/workflows/lockfileversion-check.yml index 916dcb40d2..4a3c01197c 100644 --- a/.github/workflows/lockfileversion-check.yml +++ b/.github/workflows/lockfileversion-check.yml @@ -5,7 +5,8 @@ name: Lockfile Version check on: push: branches: - - master + - next + - release-* pull_request: jobs: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86ab69041f..f77c38e3bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,8 @@ name: Release CI on: push: branches: - - master + - next + - release-* jobs: release: name: Release diff --git a/.github/workflows/sync-master-alpha.yml b/.github/workflows/sync-master-alpha.yml deleted file mode 100644 index 36d39e2ece..0000000000 --- a/.github/workflows/sync-master-alpha.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Sync alpha with master -on: - push: - branches: - - master - workflow_dispatch: - -jobs: - sync-branches: - runs-on: ubuntu-latest - name: Syncing branches - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Set up Node - uses: actions/setup-node@v1 - with: - node-version: 18 - - name: Create Pull Request - id: cpr - uses: tretuna/sync-branches@1.4.0 - with: - GITHUB_TOKEN: ${{ secrets.requirements_bot_github_token }} - FROM_BRANCH: master - TO_BRANCH: alpha - - name: Enable Pull Request Automerge - uses: peter-evans/enable-pull-request-automerge@v2 - with: - token: ${{ secrets.requirements_bot_github_token }} - pull-request-number: ${{ steps.cpr.outputs.PULL_REQUEST_NUMBER }}