diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 31e3abbd82..dc0fcada8d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,6 @@ on: push: branches: - main - - beta concurrency: # -- @@ -530,7 +529,7 @@ jobs: publish-canary: name: Publish Canary runs-on: ubuntu-latest - if: ${{ needs.all-green.result == 'success' && github.ref_name == 'beta' }} + if: ${{ needs.all-green.result == 'success' && github.ref_name == 'main' }} needs: - all-green @@ -538,4 +537,4 @@ jobs: # debug github.ref output - run: | echo github.ref: ${{ github.ref }} - echo isBeta: ${{ github.ref == 'refs/heads/beta' }} + echo isV3: ${{ github.ref == 'refs/heads/main' }} diff --git a/.github/workflows/pr-title.yml b/.github/workflows/pr-title.yml index 463b1c2ec1..d018d5863b 100644 --- a/.github/workflows/pr-title.yml +++ b/.github/workflows/pr-title.yml @@ -109,13 +109,13 @@ jobs: runs-on: ubuntu-latest if: github.event.action == 'opened' steps: - - name: Tag with main branch with v2 - if: github.event.pull_request.base.ref == 'main' + - name: Tag with 2.x branch with v2 + if: github.event.pull_request.base.ref == '2.x' uses: actions-ecosystem/action-add-labels@v1 with: labels: v2 - - name: Tag with beta branch with v3 - if: github.event.pull_request.base.ref == 'beta' + - name: Tag with main branch with v3 + if: github.event.pull_request.base.ref == 'main' uses: actions-ecosystem/action-add-labels@v1 with: labels: v3 diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml index 89a2a7aadb..413e1bc792 100644 --- a/.github/workflows/release-canary.yml +++ b/.github/workflows/release-canary.yml @@ -3,7 +3,7 @@ name: release-canary on: workflow_dispatch: branches: - - beta + - main env: NODE_VERSION: 22.6.0