Skip to content

Commit

Permalink
Point workflows at main (#423)
Browse files Browse the repository at this point in the history
## Type of change

<!-- (mark with an `X`) -->

```
- [ ] Bug fix
- [ ] New feature development
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
- [x] Build/deploy pipeline (DevOps)
- [ ] Other
```

## Objective

<!--Describe what the purpose of this PR is. For example: what bug
you're fixing or what new feature you're adding-->

Update workflows to point to `main`

## Code changes

<!--Explain the changes you've made to each file or major component.
This should help the reviewer understand your changes-->
<!--Also refer to any related changes or PRs in other repositories-->

- **.github/workflows/*:** Change all relevant references of internal
`master` branches to `main`


## Before you submit

- Please add **unit tests** where it makes sense to do so (encouraged
but not required)
- If this change requires a **documentation update** - notify the
documentation team
- If this change has particular **deployment requirements** - notify the
DevOps team
- Ensure that all UI additions follow [WCAG AA
requirements](https://contributing.bitwarden.com/contributing/accessibility/)
  • Loading branch information
joseph-flinn authored Dec 12, 2023
1 parent 6a190a1 commit c362462
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
push:
branches:
- "master"
- "main"
workflow_dispatch:

defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
push:
branches:
- "master"
- "main"
- "rc"
- "hotfix-rc"
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build .NET SDK
on:
push:
branches:
- master
- main

jobs:
generate_schemas:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build Java SDK
on:
push:
branches:
- master
- main

jobs:
generate_schemas:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-napi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
push:
branches:
- "master"
- "main"
- "rc"
- "hotfix-rc"
workflow_dispatch:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-rust-crates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:
push:
branches:
- "master"
- "main"
- "rc"
- "hotfix-rc"

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cloc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CLOC
on:
workflow_dispatch:
push:
branches: ["master"]
branches: ["main"]
pull_request:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/direct-minimal-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
push:
branches:
- "master"
- "main"
- "rc"
- "hotfix-rc"
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Lint
on:
workflow_dispatch:
push:
branches: ["master"]
branches: ["main"]
pull_request:

env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish PHP SDK
on:
push:
branches:
- master
- main

jobs:
build_rust:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Publish Ruby SDK
on:
push:
branches:
- master
- main

jobs:
generate_schemas:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-napi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
push:
branches:
- "master"
- "main"
- "rc"
- "hotfix-rc"
pull_request:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down

0 comments on commit c362462

Please sign in to comment.