diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index 2dfc012164..3d5dd6dcc4 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -5,7 +5,6 @@ on: branches: - develop - main - - v6.0.0 - 'v[0-9]+.[0-9]+.[0-9]+*beta*' types: [opened, synchronize] diff --git a/.github/workflows/docusaurus.yml b/.github/workflows/docusaurus.yml index 01ea321220..b951cad79f 100644 --- a/.github/workflows/docusaurus.yml +++ b/.github/workflows/docusaurus.yml @@ -5,9 +5,8 @@ on: branches: - main # default branch name for each repo that docs should be push from - develop - - v6.0.0 env: - branch_map: '{"refs/heads/main": "production", "refs/heads/develop": "staging", "refs/heads/v6.0.0": "production"}' + branch_map: '{"refs/heads/main": "production", "refs/heads/develop": "staging"}' jobs: push_docusaurus: runs-on: ubuntu-latest diff --git a/.github/workflows/next-release.yml b/.github/workflows/next-release.yml index 72c59b21cf..935f2fcd7c 100644 --- a/.github/workflows/next-release.yml +++ b/.github/workflows/next-release.yml @@ -4,7 +4,6 @@ on: push: branches: - develop - - v6.0.0 jobs: publish-next: diff --git a/.github/workflows/sample-distribution.yml b/.github/workflows/sample-distribution.yml index 2805041580..8540967277 100644 --- a/.github/workflows/sample-distribution.yml +++ b/.github/workflows/sample-distribution.yml @@ -1,7 +1,5 @@ name: sample-distribution -## TODO: Make sure to revert the changes here when moving this to main. We want them right now to be able to have the SampleApp live with V6. - concurrency: group: sample-distribution-${{ github.ref }} cancel-in-progress: true @@ -15,7 +13,7 @@ on: jobs: build_and_deploy_ios_testflight_qa: - name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/v6.0.0' }} + name: Build SampleApp iOS and Deploy-${{ github.ref == 'refs/heads/develop' }} runs-on: [macos-14] steps: - name: Connect Bot @@ -40,14 +38,14 @@ jobs: bundle exec pod install - name: Build and release Testflight QA working-directory: examples/SampleApp - run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/v6.0.0' }}; + run: bundle exec fastlane deploy_to_testflight_qa deploy:${{ github.ref == 'refs/heads/develop' }}; env: MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }} APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }} build_and_deploy_android_s3: - name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/v6.0.0' }} + name: Build SampleApp Android and Deploy-${{ github.ref == 'refs/heads/develop' }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -68,13 +66,13 @@ jobs: rm -rf $HOME/.gradle/caches/ && ./gradlew assembleRelease - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 - if: ${{ github.ref == 'refs/heads/v6.0.0' }} + if: ${{ github.ref == 'refs/heads/develop' }} with: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} aws-region: us-east-1 - name: Upload APK - if: ${{ github.ref == 'refs/heads/v6.0.0' }} + if: ${{ github.ref == 'refs/heads/develop' }} # https://getstream.io/downloads/rn-sample-app.apk run: | cp examples/SampleApp/android/app/build/outputs/apk/release/app-release.apk rn-sample-app.apk diff --git a/.github/workflows/sdk-size-metrics.yml b/.github/workflows/sdk-size-metrics.yml index 77c25a263c..0e799c5c07 100644 --- a/.github/workflows/sdk-size-metrics.yml +++ b/.github/workflows/sdk-size-metrics.yml @@ -9,7 +9,6 @@ on: branches: - develop - main - - v6.0.0 env: HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI diff --git a/release/next.js b/release/next.js index 173b8dbd6c..8d7eed4a4d 100644 --- a/release/next.js +++ b/release/next.js @@ -12,12 +12,7 @@ configPromise.then((config) => { name: 'develop', channel: 'beta', prerelease: 'beta', - }, - { - name: 'v6.0.0', - channel: 'rc', - prerelease: 'rc', - }, + } ], }).then((result) => { // This logics avoid a overflow of next tags in github by removing the last