From fe10fd776666a5ccad4ff7e34afe64cef1440a10 Mon Sep 17 00:00:00 2001 From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Date: Tue, 12 Dec 2023 11:12:27 -0800 Subject: [PATCH] Point workflows to main (#2896) --- .github/workflows/build.yml | 16 ++++++++-------- .github/workflows/crowdin-pull.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/stale-bot.yml | 2 +- .github/workflows/version-bump.yml | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25e94a7bd..42f4a9ee5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -271,7 +271,7 @@ jobs: if-no-files-found: error - name: Deploy to Play Store - if: ${{ matrix.variant == 'prod' && (( github.ref == 'refs/heads/master' + if: ${{ matrix.variant == 'prod' && (( github.ref == 'refs/heads/main' && needs.setup.outputs.rc_branch_exists == 0 && needs.setup.outputs.hotfix_branch_exists == 0) || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0) @@ -694,7 +694,7 @@ jobs: - name: Install AppCenter CLI if: | - (github.ref == 'refs/heads/master' + (github.ref == 'refs/heads/main' && needs.setup.outputs.rc_branch_exists == 0 && needs.setup.outputs.hotfix_branch_exists == 0) || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0) @@ -703,7 +703,7 @@ jobs: - name: Upload dSYMs to App Center if: | - (github.ref == 'refs/heads/master' + (github.ref == 'refs/heads/main' && needs.setup.outputs.rc_branch_exists == 0 && needs.setup.outputs.hotfix_branch_exists == 0) || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0) @@ -714,7 +714,7 @@ jobs: - name: Upload Watch dSYMs to Firebase Crashlytics if: | - (github.ref == 'refs/heads/master' + (github.ref == 'refs/heads/main' && needs.setup.outputs.rc_branch_exists == 0 && needs.setup.outputs.hotfix_branch_exists == 0) || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0) @@ -728,7 +728,7 @@ jobs: - name: Deploy to App Store if: | - (github.ref == 'refs/heads/master' + (github.ref == 'refs/heads/main' && needs.setup.outputs.rc_branch_exists == 0 && needs.setup.outputs.hotfix_branch_exists == 0) || (github.ref == 'refs/heads/rc' && needs.setup.outputs.hotfix_branch_exists == 0) @@ -743,7 +743,7 @@ jobs: crowdin-push: name: Crowdin Push - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' needs: - android - f-droid @@ -774,7 +774,7 @@ jobs: CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }} with: config: crowdin.yml - crowdin_branch_name: master + crowdin_branch_name: main upload_sources: true upload_translations: false @@ -792,7 +792,7 @@ jobs: steps: - name: Check if any job failed if: | - (github.ref == 'refs/heads/master') + (github.ref == 'refs/heads/main') || (github.ref == 'refs/heads/rc') || (github.ref == 'refs/heads/hotfix-rc') env: diff --git a/.github/workflows/crowdin-pull.yml b/.github/workflows/crowdin-pull.yml index 658ccb27d..7e90341a6 100644 --- a/.github/workflows/crowdin-pull.yml +++ b/.github/workflows/crowdin-pull.yml @@ -36,7 +36,7 @@ jobs: CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }} with: config: crowdin.yml - crowdin_branch_name: master + crowdin_branch_name: main upload_sources: false upload_translations: false download_translations: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4cb21b8ee..8f5e1f757 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -80,7 +80,7 @@ jobs: with: workflow: build.yml workflow_conclusion: success - branch: master + branch: main - name: Prep Bitwarden iOS release asset run: zip -r Bitwarden\ iOS.zip Bitwarden\ iOS @@ -143,7 +143,7 @@ jobs: with: workflow: build.yml workflow_conclusion: success - branch: master + branch: main name: com.x8bit.bitwarden-fdroid.apk - name: Set up Node diff --git a/.github/workflows/stale-bot.yml b/.github/workflows/stale-bot.yml index 5d605f0a0..ac05312ac 100644 --- a/.github/workflows/stale-bot.yml +++ b/.github/workflows/stale-bot.yml @@ -27,4 +27,4 @@ jobs: If you’re still working on this, please respond here after you’ve made the changes we’ve requested and our team will re-open it for further review. - Please make sure to resolve any conflicts with the master branch before requesting another review. + Please make sure to resolve any conflicts with the main branch before requesting another review. diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 9c4244471..98a3d0c70 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -146,7 +146,7 @@ jobs: TITLE: "Bump version to ${{ inputs.version_number }}" run: | PR_URL=$(gh pr create --title "$TITLE" \ - --base "master" \ + --base "main" \ --head "$PR_BRANCH" \ --label "version update" \ --label "automated pr" \ @@ -172,4 +172,4 @@ jobs: env: GH_TOKEN: ${{ steps.retrieve-secrets.outputs.github-pat-bitwarden-devops-bot-repo-scope }} PR_NUMBER: ${{ steps.create-pr.outputs.pr_number }} - run: gh pr merge $PR_NUMBER --squash --auto --delete-branch \ No newline at end of file + run: gh pr merge $PR_NUMBER --squash --auto --delete-branch