Skip to content

Commit b4b096b

Browse files
authored
Fix main branch name in various CI tasks (#6063)
1 parent 12ad4cd commit b4b096b

9 files changed

+13
-13
lines changed

.github/workflows/ci_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
pull_request:
77
push:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
determine_changed:

.github/workflows/diff-javadoc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ jobs:
3131
- name: Move branch docs to diff directory
3232
run: mv build ~/diff/modified
3333

34-
- name: Checkout master
34+
- name: Checkout main
3535
uses: actions/checkout@v4.1.1
3636
with:
3737
ref: ${{ github.base_ref }}
3838

39-
- name: Generate docs for Master
39+
- name: Generate docs for main
4040
run: ./gradlew kotlindoc
4141

42-
- name: Move master docs to diff directory
42+
- name: Move main docs to diff directory
4343
run: mv build ~/diff/original
4444

45-
- name: Get diff between Master and Branch docs
45+
- name: Get diff between main and Branch docs
4646
run: >
4747
`# Recursively diff directories, including new files, git style, with 3 lines of context`
4848
diff -wEburN ~/diff/original ~/diff/modified

.github/workflows/health-metrics.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
pull_request:
99
push:
1010
branches:
11-
- master
11+
- main
1212
# add other feature branches here
1313
# TODO(yifany): support workflow_dispatch for metric tests (or only for startup time test)
1414

@@ -92,7 +92,7 @@ jobs:
9292
(github.event_name == 'push' && github.repository == 'firebase/firebase-android-sdk')
9393
|| (github.event_name == 'pull_request'
9494
&& github.event.pull_request.head.repo.full_name == github.repository
95-
&& github.event.pull_request.base.ref == 'master')
95+
&& github.event.pull_request.base.ref == 'main')
9696
runs-on: ubuntu-latest
9797
steps:
9898
- uses: actions/checkout@v4.1.1

.github/workflows/jekyll-gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Jekyll with GitHub Pages
33
on:
44
# Runs on pushes targeting the default branch
55
push:
6-
branches: ["master"]
6+
branches: ["main"]
77
paths:
88
- '.github/workflows/jekyll-gh-pages.yml'
99
- 'contributor-docs/**'

.github/workflows/merge-to-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Merge to main
33
on:
44
pull_request:
55
branches:
6-
- master
6+
- main
77
types:
88
- opened
99
- labeled

.github/workflows/post_release_cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Create Pull Request
2929
uses: peter-evans/create-pull-request@v4
3030
with:
31-
base: 'master'
31+
base: 'main'
3232
branch: 'releases/${{ inputs.name }}.mergeback'
3333
add-paths: |
3434
**/CHANGELOG.md

.github/workflows/private-mirror-sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ concurrency:
77
on:
88
push:
99
branches:
10-
- master
10+
- main
1111

1212
jobs:
1313
sync:

.github/workflows/release-note-changes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release note changes
33
on:
44
pull_request:
55
branches:
6-
- 'master'
6+
- 'main'
77

88
jobs:
99
build:

.github/workflows/update-cpp-sdk-on-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
push:
88
branches:
99
# Change the below line if the main branch is renamed.
10-
- 'master'
10+
- 'main'
1111
paths:
1212
# Only run this if a gradle.properties file is touched.
1313
- '**/gradle.properties'

0 commit comments

Comments
 (0)