diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0874557a79c..c143da3e855 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,12 +3,10 @@ on: push: branches: - main - - next-major pull_request: merge_group: branches: - main - - next-major types: - checks_requested diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ef4ed184bcb..d9ccd00fd14 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - next-major jobs: release-main: @@ -48,17 +47,3 @@ jobs: GITHUB_TOKEN: ${{ steps.app-token.outputs.token }} NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN_SHARED }} - uses: ./.github/actions/upload-versions - - release-next-major: - if: github.ref_name == 'next-major' - name: Next major - uses: primer/.github/.github/workflows/release_with_app.yml@v2.0.0 - with: - title: Release tracking (next major) - secrets: - npm_token: ${{ secrets.NPM_AUTH_TOKEN_SHARED }} - app-id: ${{ vars.PRIMER_APP_ID_SHARED }} - private-key: ${{ secrets.PRIMER_APP_PRIVATE_KEY_SHARED }} - client-id: ${{ vars.PRIMER_APP_CLIENT_ID_SHARED }} - client-secret: ${{ secrets.PRIMER_APP_CLIENT_SECRET_SHARED }} - installation-id: ${{ vars.PRIMER_APP_INSTALLATION_ID_SHARED }} diff --git a/.github/workflows/release_canary.yml b/.github/workflows/release_canary.yml index 371291409d7..eb9a14bd92c 100644 --- a/.github/workflows/release_canary.yml +++ b/.github/workflows/release_canary.yml @@ -3,7 +3,6 @@ on: push: branches-ignore: - 'main' - - 'next-major' - 'changeset-release/**' workflow_dispatch: diff --git a/.github/workflows/release_candidate.yml b/.github/workflows/release_candidate.yml index 1d05584afb7..d0385d726ef 100644 --- a/.github/workflows/release_candidate.yml +++ b/.github/workflows/release_candidate.yml @@ -4,7 +4,6 @@ on: push: branches: - 'changeset-release/main' - - 'changeset-release/next-major' jobs: release-candidate: diff --git a/.github/workflows/reports.yml b/.github/workflows/reports.yml index 096309f75cd..22567e1271c 100644 --- a/.github/workflows/reports.yml +++ b/.github/workflows/reports.yml @@ -3,11 +3,9 @@ on: push: branches: - main - - next-major merge_group: branches: - main - - next-major types: - checks_requested diff --git a/packages/react/src/experimental/SelectPanel2/mock-story-data.ts b/packages/react/src/experimental/SelectPanel2/mock-story-data.ts index 883c1b88424..e1051de8ff6 100644 --- a/packages/react/src/experimental/SelectPanel2/mock-story-data.ts +++ b/packages/react/src/experimental/SelectPanel2/mock-story-data.ts @@ -915,9 +915,7 @@ const data = { ], branches: [ {id: 'main', name: 'main', trailingInfo: 'Default'}, - {id: 'next-major', name: 'next-major'}, {id: 'changeset-release/main', name: 'changeset-release/main'}, - {id: 'changeset-release/next-major', name: 'changeset-release/next-major'}, {id: 'selectpanel-2', name: 'selectpanel-2'}, {id: 'bs/actionlist-heading', name: 'bs/actionlist-heading'}, {id: 'refactor/support-alt-names', name: 'refactor/support-alt-names'},