From a2ff1808e8e29a724e6cc31030cd9be402fdcc11 Mon Sep 17 00:00:00 2001
From: "Randall E. Barker" <simstorm@mac.com>
Date: Tue, 30 Jun 2020 08:56:32 -0700
Subject: [PATCH] Convert master branch to use main (#3559)

---
 .taskcluster.yml        | 10 +++++-----
 CONTRIBUTING.md         |  2 +-
 README.md               |  4 ++--
 tools/docker/Dockerfile |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 426106921..d0b7a5fd3 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -50,20 +50,20 @@ tasks:
           owner: noreply@mozilla.com
           source: ${repository}
 ###############################################################################
-# Task: Master builds
+# Task: Main builds
 #
-# Triggered whenever something is pushed/merged to the master branch.
+# Triggered whenever something is pushed/merged to the main branch.
 # Produces APKs signed with the staging key. These APKs are for
 # testing only and should not be uploaded to App Stores.
 #
 ###############################################################################
-    - $if: 'tasks_for == "github-push" && (event["ref"] == "refs/heads/master" || isFeatureBranch == true)'
+    - $if: 'tasks_for == "github-push" && (event["ref"] == "refs/heads/main" || isFeatureBranch == true)'
       then:
         $let:
           featureName:
             $if: 'isFeatureBranch == true'
             then: "-f ${event.ref[19:]}"
-            else: "-f master"
+            else: "-f main"
         in:
           provisionerId: 'proj-firefoxreality'
           workerType: 'ci-linux'
@@ -76,7 +76,7 @@ tasks:
             - "secrets:get:project/firefoxreality/fr/mls-key"
           routes:
             - notify.email.fxr-releng@mozilla.com.on-any
-            - index.project.firefoxreality.master
+            - index.project.firefoxreality.main
           payload:
             maxRunTime: 14400
             image: 'mozillamixedreality/firefoxreality:200316-SDK29'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f467cd2bd..8d4f3f758 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,7 +13,7 @@ Head over to [Good First Bugs](https://github.com/MozillaReality/FirefoxReality/
 
 ## Pull Request Checklist
 
-- 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.
+- 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.
 
 - Commits should be as small as possible, while ensuring that each commit is correct independently (i.e., each commit should compile and pass tests). 
 
diff --git a/README.md b/README.md
index 39d891a34..1c4da9c16 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ You can find us in [#fxr:mozilla.org on the Matrix](https://chat.mozilla.org/#/r
 
 ## Download developer APKs
 
-**[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).
+**[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).
 
 ## Locale support
 
@@ -39,7 +39,7 @@ This repo is only available to Mozilla employees. If you have access to the rele
 The [repo in `third_party`](https://github.com/MozillaReality/FirefoxReality-android-third-party) can be updated like so:
 
 ```bash
-pushd third_party && git fetch && git checkout master && git rebase origin/master && popd
+pushd third_party && git fetch && git checkout main && git rebase origin/main && popd
 ```
 
 *Fetch Git submodules.*
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 6e74a6793..93ee723de 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -60,12 +60,12 @@ RUN git config --global user.email "noreply@mozilla.com"
 RUN git config --global user.name "No Reply"
 RUN echo sdk.dir=/opt > local.properties && echo ndk.dir=/opt/ndk-bundle >> local.properties
 RUN git checkout -b update origin/gradle
-RUN git rebase origin/master
+RUN git rebase origin/main
 RUN git submodule init
 RUN git submodule update
 RUN ./gradlew --no-daemon assembleNoapi
 RUN ./gradlew --no-daemon clean
-RUN git checkout master
+RUN git checkout main
 
 # -- Cleanup ----------------------------------------------------------------------------