Skip to content

Commit a2ff180

Browse files
authored
Convert master branch to use main (#3559)
1 parent 5fd1bfd commit a2ff180

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.taskcluster.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,20 +50,20 @@ tasks:
5050
5151
source: ${repository}
5252
###############################################################################
53-
# Task: Master builds
53+
# Task: Main builds
5454
#
55-
# Triggered whenever something is pushed/merged to the master branch.
55+
# Triggered whenever something is pushed/merged to the main branch.
5656
# Produces APKs signed with the staging key. These APKs are for
5757
# testing only and should not be uploaded to App Stores.
5858
#
5959
###############################################################################
60-
- $if: 'tasks_for == "github-push" && (event["ref"] == "refs/heads/master" || isFeatureBranch == true)'
60+
- $if: 'tasks_for == "github-push" && (event["ref"] == "refs/heads/main" || isFeatureBranch == true)'
6161
then:
6262
$let:
6363
featureName:
6464
$if: 'isFeatureBranch == true'
6565
then: "-f ${event.ref[19:]}"
66-
else: "-f master"
66+
else: "-f main"
6767
in:
6868
provisionerId: 'proj-firefoxreality'
6969
workerType: 'ci-linux'
@@ -76,7 +76,7 @@ tasks:
7676
- "secrets:get:project/firefoxreality/fr/mls-key"
7777
routes:
7878
79-
- index.project.firefoxreality.master
79+
- index.project.firefoxreality.main
8080
payload:
8181
maxRunTime: 14400
8282
image: 'mozillamixedreality/firefoxreality:200316-SDK29'

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Head over to [Good First Bugs](https://github.com/MozillaReality/FirefoxReality/
1313

1414
## Pull Request Checklist
1515

16-
- Branch from the [master](https://github.com/mozillareality/firefoxreality/tree/master) branch and, if needed, [rebase](https://help.github.com/en/articles/about-git-rebase) to the current master branch before submitting your pull request. If it doesn't merge cleanly with master, you may be asked to [rebase](https://help.github.com/en/articles/about-git-rebase) your changes.
16+
- Branch from the [main](https://github.com/mozillareality/firefoxreality/tree/main) branch and, if needed, [rebase](https://help.github.com/en/articles/about-git-rebase) to the current main branch before submitting your pull request. If it doesn't merge cleanly with main, you may be asked to [rebase](https://help.github.com/en/articles/about-git-rebase) your changes.
1717

1818
- Commits should be as small as possible, while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests).
1919

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ You can find us in [#fxr:mozilla.org on the Matrix](https://chat.mozilla.org/#/r
66

77
## Download developer APKs
88

9-
**[Download](https://community-tc.services.mozilla.com/tasks/index/project.firefoxreality/master)** developer APKs for Firefox Reality generated from latest [master](https://github.com/MozillaReality/FirefoxReality/commits/master).
9+
**[Download](https://community-tc.services.mozilla.com/tasks/index/project.firefoxreality/main)** developer APKs for Firefox Reality generated from latest [main](https://github.com/MozillaReality/FirefoxReality/commits/main).
1010

1111
## Locale support
1212

@@ -39,7 +39,7 @@ This repo is only available to Mozilla employees. If you have access to the rele
3939
The [repo in `third_party`](https://github.com/MozillaReality/FirefoxReality-android-third-party) can be updated like so:
4040

4141
```bash
42-
pushd third_party && git fetch && git checkout master && git rebase origin/master && popd
42+
pushd third_party && git fetch && git checkout main && git rebase origin/main && popd
4343
```
4444

4545
*Fetch Git submodules.*

tools/docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ RUN git config --global user.email "[email protected]"
6060
RUN git config --global user.name "No Reply"
6161
RUN echo sdk.dir=/opt > local.properties && echo ndk.dir=/opt/ndk-bundle >> local.properties
6262
RUN git checkout -b update origin/gradle
63-
RUN git rebase origin/master
63+
RUN git rebase origin/main
6464
RUN git submodule init
6565
RUN git submodule update
6666
RUN ./gradlew --no-daemon assembleNoapi
6767
RUN ./gradlew --no-daemon clean
68-
RUN git checkout master
68+
RUN git checkout main
6969

7070
# -- Cleanup ----------------------------------------------------------------------------
7171

0 commit comments

Comments
 (0)