diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml index 22eda7f88..424d048e9 100644 --- a/.github/workflows/build-android.yml +++ b/.github/workflows/build-android.yml @@ -5,7 +5,7 @@ on: pull_request: push: branches: - - "master" + - "main" workflow_dispatch: defaults: diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml index 4239a9a0a..c8b1e97dd 100644 --- a/.github/workflows/build-cli.yml +++ b/.github/workflows/build-cli.yml @@ -5,7 +5,7 @@ on: pull_request: push: branches: - - "master" + - "main" - "rc" - "hotfix-rc" workflow_dispatch: diff --git a/.github/workflows/build-dotnet.yml b/.github/workflows/build-dotnet.yml index 7ebb03526..91f21210b 100644 --- a/.github/workflows/build-dotnet.yml +++ b/.github/workflows/build-dotnet.yml @@ -3,7 +3,7 @@ name: Build .NET SDK on: push: branches: - - master + - main jobs: generate_schemas: diff --git a/.github/workflows/build-java.yml b/.github/workflows/build-java.yml index 002164647..663f0d493 100644 --- a/.github/workflows/build-java.yml +++ b/.github/workflows/build-java.yml @@ -3,7 +3,7 @@ name: Build Java SDK on: push: branches: - - master + - main jobs: generate_schemas: diff --git a/.github/workflows/build-napi.yml b/.github/workflows/build-napi.yml index d5bd935e9..96d96fb8c 100644 --- a/.github/workflows/build-napi.yml +++ b/.github/workflows/build-napi.yml @@ -5,7 +5,7 @@ on: pull_request: push: branches: - - "master" + - "main" - "rc" - "hotfix-rc" workflow_dispatch: diff --git a/.github/workflows/build-rust-crates.yml b/.github/workflows/build-rust-crates.yml index 7504887f0..b008540fb 100644 --- a/.github/workflows/build-rust-crates.yml +++ b/.github/workflows/build-rust-crates.yml @@ -6,7 +6,7 @@ on: pull_request: push: branches: - - "master" + - "main" - "rc" - "hotfix-rc" @@ -59,7 +59,7 @@ jobs: release-dry-run: name: Release dry-run runs-on: ubuntu-latest - if: ${{ github.ref == 'refs/head/master' || github.ref == 'refs/head/rc' || github.ref == 'refs/head/hotfix-rc' }} + if: ${{ github.ref == 'refs/head/main' || github.ref == 'refs/head/rc' || github.ref == 'refs/head/hotfix-rc' }} needs: - build steps: diff --git a/.github/workflows/cloc.yml b/.github/workflows/cloc.yml index a3afad257..f87ba6aa8 100644 --- a/.github/workflows/cloc.yml +++ b/.github/workflows/cloc.yml @@ -3,7 +3,7 @@ name: CLOC on: workflow_dispatch: push: - branches: ["master"] + branches: ["main"] pull_request: jobs: diff --git a/.github/workflows/direct-minimal-versions.yml b/.github/workflows/direct-minimal-versions.yml index f164a2433..eb911072f 100644 --- a/.github/workflows/direct-minimal-versions.yml +++ b/.github/workflows/direct-minimal-versions.yml @@ -5,7 +5,7 @@ on: pull_request: push: branches: - - "master" + - "main" - "rc" - "hotfix-rc" workflow_dispatch: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d6e57740e..0d2dbed91 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -3,7 +3,7 @@ name: Lint on: workflow_dispatch: push: - branches: ["master"] + branches: ["main"] pull_request: env: diff --git a/.github/workflows/publish-php.yml b/.github/workflows/publish-php.yml index b033319ec..ef03eca4a 100644 --- a/.github/workflows/publish-php.yml +++ b/.github/workflows/publish-php.yml @@ -3,7 +3,7 @@ name: Publish PHP SDK on: push: branches: - - master + - main jobs: build_rust: diff --git a/.github/workflows/publish-ruby.yml b/.github/workflows/publish-ruby.yml index fa46af292..c7d5ded20 100644 --- a/.github/workflows/publish-ruby.yml +++ b/.github/workflows/publish-ruby.yml @@ -3,7 +3,7 @@ name: Publish Ruby SDK on: push: branches: - - master + - main jobs: generate_schemas: diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 04863f34e..ee08c2be8 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -72,7 +72,7 @@ jobs: workflow: build-cli.yml path: packages workflow_conclusion: success - branch: master + branch: main - name: Get checksum files uses: bitwarden/gh-actions/get-checksum@main diff --git a/.github/workflows/release-napi.yml b/.github/workflows/release-napi.yml index 3171cfb33..19595832a 100644 --- a/.github/workflows/release-napi.yml +++ b/.github/workflows/release-napi.yml @@ -117,7 +117,7 @@ jobs: artifacts: schemas.ts path: ${{ github.workspace }}/crates/bitwarden-napi/src-ts/bitwarden_client/ workflow_conclusion: success - branch: master + branch: main - name: Install dependencies run: npm ci @@ -153,7 +153,7 @@ jobs: workflow: build-napi.yml path: ${{ github.workspace }}/crates/bitwarden-napi/artifacts workflow_conclusion: success - branch: master + branch: main - name: Move artifacts run: npm run artifacts diff --git a/.github/workflows/rust-test.yml b/.github/workflows/rust-test.yml index 2ea0ad5eb..49775481b 100644 --- a/.github/workflows/rust-test.yml +++ b/.github/workflows/rust-test.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: branches: - - "master" + - "main" - "rc" - "hotfix-rc" pull_request: diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 19af72c1d..31e8b4a3a 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -179,7 +179,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" \