Skip to content

Commit ca522d2

Browse files
authored
[Infra] Rename references from master to main (#12203)
1 parent a8264f0 commit ca522d2

File tree

42 files changed

+179
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+179
-179
lines changed

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
paths-ignore:
66
- 'Firestore/**'
77
push:
8-
branches: master
8+
branches: main
99

1010
concurrency:
1111
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

.github/workflows/health-metrics-presubmit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
needs: check
5959
# Prevent the job from being triggered in fork.
6060
# always() will trigger this job when `needs` are skipped in a `merge` pull_request event.
61-
if: always() && github.event.pull_request.head.repo.full_name == github.repository && ((github.event.action != 'closed' && github.event.pull_request.base.ref == 'master') || github.event.pull_request.merged)
61+
if: always() && github.event.pull_request.head.repo.full_name == github.repository && ((github.event.action != 'closed' && github.event.pull_request.base.ref == 'main') || github.event.pull_request.merged)
6262
runs-on: macos-12
6363
strategy:
6464
matrix:
@@ -384,7 +384,7 @@ jobs:
384384
with:
385385
path: /Users/runner/test
386386
- name: Compare Diff and Post a Report
387-
if: github.event.pull_request.merged != true && github.event.action != 'closed' && github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.base.ref == 'master'
387+
if: github.event.pull_request.merged != true && github.event.action != 'closed' && github.event.pull_request.head.repo.full_name == github.repository && github.event.pull_request.base.ref == 'main'
388388
env:
389389
base_commit: ${{ needs.check.outputs.target_branch_head }}
390390
run: |

.github/workflows/performance-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Merge the yml file to master branch for the cron job schedule to be effective.
1+
# Merge the yml file to main branch for the cron job schedule to be effective.
22
# Reference: https://github.community/t/on-schedule-per-branch/17525
33
name: performance-integration-tests
44

.github/workflows/performance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Merge the yml file to master branch for the cron job schedule to be effective.
1+
# Merge the yml file to main branch for the cron job schedule to be effective.
22
# Reference: https://github.community/t/on-schedule-per-branch/17525
33
name: performance
44

.github/workflows/prerelease.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# testing repo.
2626
local_sdk_repo_dir: /tmp/test/firebase-ios-sdk
2727
local_repo: specstesting
28-
podspec_repo_branch: master
28+
podspec_repo_branch: main
2929
outputs:
3030
matrix: ${{ steps.generate_matrix.outputs.matrix }}
3131
steps:
@@ -161,7 +161,7 @@ jobs:
161161
bot_token_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
162162
local_repo: specstesting
163163
local_sdk_repo_dir: /tmp/test/firebase-ios-sdk
164-
podspec_repo_branch: master
164+
podspec_repo_branch: main
165165
steps:
166166
- uses: actions/checkout@v4
167167
- name: Get token
@@ -173,14 +173,14 @@ jobs:
173173
- name: Update SpecsTesting repo setup
174174
run: |
175175
ossbotaccess=`cat oss-bot-access.txt`
176-
# Update/create a nightly tag to the head of the master branch.
176+
# Update/create a nightly tag to the head of the main branch.
177177
BOT_TOKEN="${ossbotaccess}" test_version="${nightly_version}" sdk_version_config="${GITHUB_WORKSPACE}/scripts/create_spec_repo/RC_firebase_sdk.textproto" local_sdk_repo_dir="${local_sdk_repo_dir}" podspec_repo_branch="${podspec_repo_branch}" scripts/release_testing_setup.sh prerelease_testing
178178
- name: Push updated podspecs
179179
run: |
180180
botaccess=`cat bot-access.txt`
181181
cd "${local_sdk_repo_dir}"
182182
# Changes in post submit tests will be fetched by getting diff between
183-
# the HEAD and HEAD^ of the master branch.
183+
# the HEAD and HEAD^ of the main branch.
184184
common_commit=$(git rev-parse HEAD^)
185185
git diff --name-only $common_commit remotes/origin/${podspec_repo_branch} > updated_files.txt
186186
updated_podspecs=()

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
# testing repo.
2828
local_sdk_repo_dir: /tmp/test/firebase-ios-sdk
2929
local_repo: specstesting
30-
podspec_repo_branch: master
30+
podspec_repo_branch: main
3131
outputs:
3232
matrix: ${{ steps.generate_matrix.outputs.matrix }}
3333
steps:

.github/workflows/sessions-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Merge the yml file to master branch for the cron job schedule to be effective.
1+
# Merge the yml file to main branch for the cron job schedule to be effective.
22
# Reference: https://github.community/t/on-schedule-per-branch/17525
33
name: sessions-integration-tests
44

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,8 @@ For developers without write access, you'll need to create a fork of Firebase
326326
instead of a branch. Learn more about forking a repo [here][github-forks].
327327

328328
```console
329-
# Update your local master
330-
git checkout master
329+
# Update your local main
330+
git checkout main
331331
git pull
332332

333333
# Create a development branch

Carthage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseStorageBinary.jso
7777

7878
- For Crashlytics, do the following steps to automatically upload your app's symbols so your app's crashes are symbolicated:
7979
- Download
80-
[upload-symbols](https://github.com/firebase/firebase-ios-sdk/raw/master/Crashlytics/upload-symbols)
81-
and [run](https://github.com/firebase/firebase-ios-sdk/raw/master/Crashlytics/run).
80+
[upload-symbols](https://github.com/firebase/firebase-ios-sdk/raw/main/Crashlytics/upload-symbols)
81+
and [run](https://github.com/firebase/firebase-ios-sdk/raw/main/Crashlytics/run).
8282
Note: please see the [discussion](https://github.com/firebase/firebase-ios-sdk/issues/4720#issuecomment-577213858)
8383
for details why it has to be done manually.
8484
- Put these in the directory where your `.xcodeproj` file lives, eg. `scripts/run` and `scripts/upload-symbols`

Crashlytics/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@
164164

165165
This Firebase Crashlytics version includes the initial beta release of the Firebase Crashlytics SDK:
166166

167-
- [feature] The SDK is now open-sourced. Take a look in our [GitHub repository](https://github.com/firebase/firebase-ios-sdk/tree/master/Crashlytics).
167+
- [feature] The SDK is now open-sourced. Take a look in our [GitHub repository](https://github.com/firebase/firebase-ios-sdk/tree/main/Crashlytics).
168168
- [feature] Added support for Catalyst (note that Crashlytics still supports tvOS and macOS).
169169
- [feature] Added new APIs that are more consistent with other Firebase SDKs and more intuitive to use. The new APIs also give your users more control over how you collect their data.
170170
- [removed] Removed the Fabric API Key. Now, Crashlytics uses the GoogleService-Info.plist file to associate your app with your project. If you linked your app from Fabric and want to upgrade to the new SDK, remove the Fabric API key from your `run` and `upload-symbols` scripts. We also recommend removing the Fabric section from your app's Info.plist (when you upgrade, Crashlytics uses the new configuration you set up in Firebase).

0 commit comments

Comments
 (0)