From 9c1169d035db0c7afb7fe9be9e9d94cbb7efe594 Mon Sep 17 00:00:00 2001 From: Joseph Flinn <58369717+joseph-flinn@users.noreply.github.com> Date: Tue, 12 Dec 2023 11:57:50 -0800 Subject: [PATCH] Update master to main in workflows (#7151) --- .github/workflows/auto-branch-updater.yml | 2 +- .github/workflows/build-browser.yml | 8 ++++---- .github/workflows/build-cli.yml | 4 ++-- .github/workflows/build-desktop.yml | 10 +++++----- .github/workflows/build-web.yml | 12 ++++++------ .github/workflows/crowdin-pull.yml | 2 +- .github/workflows/deploy-eu-prod-web.yml | 4 ++-- .github/workflows/deploy-eu-qa-web.yml | 4 ++-- .github/workflows/label-issue-pull-request.yml | 4 ++-- .github/workflows/release-browser.yml | 4 ++-- .github/workflows/release-cli.yml | 8 ++++---- .github/workflows/release-desktop-beta.yml | 12 ++++++------ .github/workflows/release-desktop.yml | 6 +++--- .github/workflows/release-web.yml | 8 ++++---- .github/workflows/stale-bot.yml | 2 +- .github/workflows/version-bump.yml | 2 +- 16 files changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/auto-branch-updater.yml b/.github/workflows/auto-branch-updater.yml index fee2ad958f..8eb9ac19c8 100644 --- a/.github/workflows/auto-branch-updater.yml +++ b/.github/workflows/auto-branch-updater.yml @@ -4,7 +4,7 @@ name: Auto Update Branch on: push: branches: - - 'master' + - 'main' - 'rc' paths: - 'apps/web/**' diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml index f16021570a..d5df9772e1 100644 --- a/.github/workflows/build-browser.yml +++ b/.github/workflows/build-browser.yml @@ -14,7 +14,7 @@ on: - '!*.txt' push: branches: - - 'master' + - 'main' - 'rc' - 'hotfix-rc-browser' paths: @@ -351,7 +351,7 @@ jobs: crowdin-push: name: Crowdin Push - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' runs-on: ubuntu-22.04 needs: - build @@ -380,7 +380,7 @@ jobs: CROWDIN_PROJECT_ID: "268134" with: config: apps/browser/crowdin.yml - crowdin_branch_name: master + crowdin_branch_name: main upload_sources: true upload_translations: false @@ -397,7 +397,7 @@ jobs: - crowdin-push steps: - name: Check if any job failed - if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') }} + if: ${{ (github.ref == 'refs/heads/main') || (github.ref == 'refs/heads/rc') }} env: CLOC_STATUS: ${{ needs.cloc.result }} SETUP_STATUS: ${{ needs.setup.result }} diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml index e5e2aeaa88..d6f089501a 100644 --- a/.github/workflows/build-cli.yml +++ b/.github/workflows/build-cli.yml @@ -15,7 +15,7 @@ on: - '.github/workflows/build-cli.yml' push: branches: - - 'master' + - 'main' - 'rc' - 'hotfix-rc-cli' paths: @@ -379,7 +379,7 @@ jobs: steps: - name: Check if any job failed working-directory: ${{ github.workspace }} - if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') }} + if: ${{ (github.ref == 'refs/heads/main') || (github.ref == 'refs/heads/rc') }} env: CLOC_STATUS: ${{ needs.cloc.result }} SETUP_STATUS: ${{ needs.setup.result }} diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index b75e8457ea..87c3a66478 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -15,7 +15,7 @@ on: - '.github/workflows/build-desktop.yml' push: branches: - - 'master' + - 'main' - 'rc' - 'hotfix-rc-desktop' paths: @@ -973,7 +973,7 @@ jobs: APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} 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) @@ -1154,7 +1154,7 @@ jobs: crowdin-push: name: Crowdin Push - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' needs: - linux - windows @@ -1185,7 +1185,7 @@ jobs: CROWDIN_PROJECT_ID: "299360" with: config: apps/desktop/crowdin.yml - crowdin_branch_name: master + crowdin_branch_name: main upload_sources: true upload_translations: false @@ -1207,7 +1207,7 @@ jobs: - crowdin-push steps: - name: Check if any job failed - if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') }} + if: ${{ (github.ref == 'refs/heads/main') || (github.ref == 'refs/heads/rc') }} env: CLOC_STATUS: ${{ needs.cloc.result }} ELECTRON_VERIFY_STATUS: ${{ needs.electron-verify.result }} diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml index b6681c0dac..154e2574f4 100644 --- a/.github/workflows/build-web.yml +++ b/.github/workflows/build-web.yml @@ -15,7 +15,7 @@ on: - '.github/workflows/build-web.yml' push: branches: - - 'master' + - 'main' - 'rc' - 'hotfix-rc-web' paths: @@ -170,7 +170,7 @@ jobs: - name: Check Branch to Publish env: - PUBLISH_BRANCHES: "master,rc,hotfix-rc-web" + PUBLISH_BRANCHES: "main,rc,hotfix-rc-web" id: publish-branch-check run: | IFS="," read -a publish_branches <<< $PUBLISH_BRANCHES @@ -218,7 +218,7 @@ jobs: IMAGE_TAG=$(echo "${GITHUB_REF:11}" | sed "s#/#-#g") fi - if [[ "$IMAGE_TAG" == "master" ]]; then + if [[ "$IMAGE_TAG" == "main" ]]; then IMAGE_TAG=dev fi @@ -259,7 +259,7 @@ jobs: crowdin-push: name: Crowdin Push - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' needs: build-artifacts runs-on: ubuntu-22.04 steps: @@ -286,7 +286,7 @@ jobs: CROWDIN_PROJECT_ID: "308189" with: config: apps/web/crowdin.yml - crowdin_branch_name: master + crowdin_branch_name: main upload_sources: true upload_translations: false @@ -303,7 +303,7 @@ jobs: - crowdin-push steps: - name: Check if any job failed - if: ${{ (github.ref == 'refs/heads/master') || (github.ref == 'refs/heads/rc') }} + if: ${{ (github.ref == 'refs/heads/main') || (github.ref == 'refs/heads/rc') }} env: CLOC_STATUS: ${{ needs.cloc.result }} SETUP_STATUS: ${{ needs.setup.result }} diff --git a/.github/workflows/crowdin-pull.yml b/.github/workflows/crowdin-pull.yml index 5ffedc267f..3600f048c2 100644 --- a/.github/workflows/crowdin-pull.yml +++ b/.github/workflows/crowdin-pull.yml @@ -45,7 +45,7 @@ jobs: CROWDIN_PROJECT_ID: ${{ matrix.crowdin_project_id }} 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/deploy-eu-prod-web.yml b/.github/workflows/deploy-eu-prod-web.yml index 2c7835caef..5eb8ace1ed 100644 --- a/.github/workflows/deploy-eu-prod-web.yml +++ b/.github/workflows/deploy-eu-prod-web.yml @@ -5,10 +5,10 @@ on: workflow_dispatch: inputs: tag: - description: "Branch name to deploy (examples: 'master', 'feature/sm')" + description: "Branch name to deploy (examples: 'main', 'feature/sm')" required: true type: string - default: master + default: main jobs: azure-deploy: diff --git a/.github/workflows/deploy-eu-qa-web.yml b/.github/workflows/deploy-eu-qa-web.yml index 9fa50f3ba3..e0291063ee 100644 --- a/.github/workflows/deploy-eu-qa-web.yml +++ b/.github/workflows/deploy-eu-qa-web.yml @@ -5,10 +5,10 @@ on: workflow_dispatch: inputs: tag: - description: "Branch name to deploy (examples: 'master', 'feature/sm')" + description: "Branch name to deploy (examples: 'main', 'feature/sm')" required: true type: string - default: master + default: main jobs: notify-start: diff --git a/.github/workflows/label-issue-pull-request.yml b/.github/workflows/label-issue-pull-request.yml index d0aad2f2b2..e52bba36d6 100644 --- a/.github/workflows/label-issue-pull-request.yml +++ b/.github/workflows/label-issue-pull-request.yml @@ -1,5 +1,5 @@ # Runs creation of Pull Requests -# If the PR destination branch is master, add a needs-qa label unless created by renovate[bot] +# If the PR destination branch is main, add a needs-qa label unless created by renovate[bot] --- name: Label Issue Pull Request @@ -10,7 +10,7 @@ on: paths-ignore: - .github/workflows/** # We don't need QA on workflow changes branches: - - 'master' # We only want to check when PRs target master + - 'main' # We only want to check when PRs target main jobs: add-needs-qa-label: diff --git a/.github/workflows/release-browser.yml b/.github/workflows/release-browser.yml index dd17bcbcec..ad6a8fa782 100644 --- a/.github/workflows/release-browser.yml +++ b/.github/workflows/release-browser.yml @@ -114,13 +114,13 @@ jobs: dist-firefox-*.zip, dist-edge-*.zip' - - name: Dry Run - Download latest master build artifacts + - name: Dry Run - Download latest build artifacts if: ${{ github.event.inputs.release_type == 'Dry Run' }} uses: bitwarden/gh-actions/download-artifacts@main with: workflow: build-browser.yml workflow_conclusion: success - branch: master + branch: main artifacts: 'browser-source-*.zip, dist-chrome-*.zip, dist-opera-*.zip, diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 194b802961..6c4092fd30 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -92,7 +92,7 @@ jobs: workflow: build-cli.yml path: apps/cli workflow_conclusion: success - branch: master + branch: main - name: Create release if: ${{ github.event.inputs.release_type != 'Dry Run' }} @@ -175,7 +175,7 @@ jobs: workflow: build-cli.yml path: apps/cli workflow_conclusion: success - branch: master + branch: main artifacts: bw_${{ env._PKG_VERSION }}_amd64.snap - name: Publish Snap & logout @@ -235,7 +235,7 @@ jobs: workflow: build-cli.yml path: apps/cli/dist workflow_conclusion: success - branch: master + branch: main artifacts: bitwarden-cli.${{ env._PKG_VERSION }}.nupkg - name: Push to Chocolatey @@ -285,7 +285,7 @@ jobs: workflow: build-cli.yml path: apps/cli/build workflow_conclusion: success - branch: master + branch: main artifacts: bitwarden-cli-${{ env._PKG_VERSION }}-npm-build.zip - name: Setup NPM diff --git a/.github/workflows/release-desktop-beta.yml b/.github/workflows/release-desktop-beta.yml index fb9c710a5f..8330e71c72 100644 --- a/.github/workflows/release-desktop-beta.yml +++ b/.github/workflows/release-desktop-beta.yml @@ -28,9 +28,9 @@ jobs: - name: Branch check run: | - if [[ "$GITHUB_REF" != "refs/heads/master" ]] && [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then + if [[ "$GITHUB_REF" != "refs/heads/main" ]] && [[ "$GITHUB_REF" != "refs/heads/rc" ]] && [[ "$GITHUB_REF" != "refs/heads/hotfix-rc" ]]; then echo "===================================" - echo "[!] Can only release from the 'master', 'rc' or 'hotfix-rc' branches" + echo "[!] Can only release from the 'main', 'rc' or 'hotfix-rc' branches" echo "===================================" exit 1 fi @@ -661,13 +661,13 @@ jobs: branch: rc path: ${{ github.workspace }}/browser-build-artifacts - - name: Download artifact from master + - name: Download artifacts from main if: ${{ github.ref != 'refs/heads/rc' && github.ref != 'refs/heads/hotfix-rc' }} uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0 with: workflow: build-browser.yml workflow_conclusion: success - branch: master + branch: main path: ${{ github.workspace }}/browser-build-artifacts - name: Unzip Safari artifact @@ -859,13 +859,13 @@ jobs: branch: rc path: ${{ github.workspace }}/browser-build-artifacts - - name: Download artifact from master + - name: Download artifact from main if: ${{ github.ref != 'refs/heads/rc' && github.ref != 'refs/heads/hotfix-rc' }} uses: dawidd6/action-download-artifact@246dbf436b23d7c49e21a7ab8204ca9ecd1fe615 # v2.27.0 with: workflow: build-browser.yml workflow_conclusion: success - branch: master + branch: main path: ${{ github.workspace }}/browser-build-artifacts - name: Unzip Safari artifact diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml index 31008a6781..4ffdc92fc2 100644 --- a/.github/workflows/release-desktop.yml +++ b/.github/workflows/release-desktop.yml @@ -136,7 +136,7 @@ jobs: with: workflow: build-desktop.yml workflow_conclusion: success - branch: master + branch: main path: apps/desktop/artifacts - name: Rename .pkg to .pkg.archive @@ -291,7 +291,7 @@ jobs: with: workflow: build-desktop.yml workflow_conclusion: success - branch: master + branch: main artifacts: bitwarden_${{ env._PKG_VERSION }}_amd64.snap path: apps/desktop/dist @@ -359,7 +359,7 @@ jobs: with: workflow: build-desktop.yml workflow_conclusion: success - branch: master + branch: main artifacts: bitwarden.${{ env._PKG_VERSION }}.nupkg path: apps/desktop/dist diff --git a/.github/workflows/release-web.yml b/.github/workflows/release-web.yml index c946f1294a..a084ec1f02 100644 --- a/.github/workflows/release-web.yml +++ b/.github/workflows/release-web.yml @@ -159,7 +159,7 @@ jobs: workflow: build-web.yml path: assets workflow_conclusion: success - branch: master + branch: main artifacts: web-*-cloud-COMMERCIAL.zip - name: Unzip build asset @@ -196,12 +196,12 @@ jobs: gh pr create --title "Deploy v${_RELEASE_VERSION} to GitHub Pages" \ --draft \ --body "Deploying v${_RELEASE_VERSION}" \ - --base master \ + --base main \ --head "${_BRANCH}" else gh pr create --title "Deploy v${_RELEASE_VERSION} to GitHub Pages" \ --body "Deploying v${_RELEASE_VERSION}" \ - --base master \ + --base main \ --head "${_BRANCH}" fi @@ -243,7 +243,7 @@ jobs: workflow: build-web.yml path: apps/web/artifacts workflow_conclusion: success - branch: master + branch: main artifacts: "web-*-selfhosted-COMMERCIAL.zip, web-*-selfhosted-open-source.zip" diff --git a/.github/workflows/stale-bot.yml b/.github/workflows/stale-bot.yml index 98f3b9d172..1bd058b94b 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 9a78f995e8..8e126e1da6 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -286,7 +286,7 @@ jobs: TITLE: "Bump ${{ steps.create-branch.outputs.client }} 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" \