Unverified Commit 6a3adb5a authored by Stefan Arentz's avatar Stefan Arentz Committed by GitHub
Browse files

Fixes #11427 - Rename master branch to main (#20457)

* Fixes #11427 - Rename master branch to main (Automation/TC)

* Fixes #11427 - Rename master branch to main (GitHub Workflows)

* Fixes #11427 - Rename master branch to main (GitHub Workflows)

* Fixes #11427 - Rename master branch to main (GitHub Issue Templates)

* Fixes #11427 - Rename master branch to main (Jenkins)

* Fixes #11427 - Rename master branch to main (README & Documentation)

* Fixes #11427 - Rename master branch to main (Jenkins)

* Fixes #11427 - Rename master branch to main (Random)
parent 173786d6
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ There are two releases this covers: the current sprint that is going out to Beta

## Sprint X.1 End [Wednesday, 2nd week] Cutting a Beta
- [ ] Make a new Beta
    - [ ] Create a branch off of master (DO NOT PUSH YET) for the *current* milestone of format `releases_v85.0.0`. After that, anything landing in master will be part of the next release.
    - [ ] Create a branch off of main (DO NOT PUSH YET) for the *current* milestone of format `releases_v85.0.0`. After that, anything landing in main will be part of the next release.
       - ⚠️ Please **do not** use `/` in branch names anymore: Taskcluster silently ignores them and doesn't output tasks at the right index.
    - [ ] Bump `version.txt` to match the new version number
    - [ ] Grant [mozilla-release-automation-bot](https://github.com/mozilla-release-automation-bot) write access to this branch.
@@ -41,7 +41,7 @@ There are two releases this covers: the current sprint that is going out to Beta
    - [ ] Send an email to QA at mozilla-mobile-qa@softvision.com with a link to the Taskcluster build (subdirectory of the [Fenix CI](https://firefox-ci-tc.services.mozilla.com/tasks/index/mobile.v2.fenix.beta))

### Bugfix uplifts / Beta Product Integrity (Beta Release until PI green signoff)
- [ ] If bugs are considered release blocker then find someone to fix them on master and the milestone branch (cherry-pick / uplift)
- [ ] If bugs are considered release blocker then find someone to fix them on main and the milestone branch (cherry-pick / uplift)
    - [ ] Add the uplift request to the appropriate row in the [Uplifts document](https://docs.google.com/spreadsheets/d/1qIvHpcQ3BqJtlzV5T4M1MhbWVxkNiG-ToeYnWEBW4-I/edit#gid=0).
- [ ] If needed, ship a new beta version (e.g. v1.0-beta.2) and follow the submission checklist again.
- [ ] Once there is GREEN QA signoff, file a [release management bugzilla for rollout](https://bugzilla.mozilla.org/show_bug.cgi?id=1664366)
@@ -49,8 +49,8 @@ There are two releases this covers: the current sprint that is going out to Beta

### Uplifting L10N strings to Beta [Wednesday, 2 weeks after sprint end]
- [ ] Find the issue ([example](https://github.com/mozilla-mobile/fenix/issues/16381)) filed by L10N / delphine saying string are ready for uplift (it takes 2 weeks for localizers to prepare localization).
- [ ] If there are new locales that are ready to be added to Release, add them to [l10n-release.toml](https://github.com/mozilla-mobile/fenix/blob/master/l10n-release.toml)
- [ ] Run the [L10N uplift script](https://github.com/mozilla-mobile/fenix/blob/master/l10n-uplift.py) against the releases/vX.1 branch (releases/v85.0.0). There will likely be conflicts, but if you are confused, they should match the strings in [main/Nightly](https://github.com/mozilla-mobile/fenix/tree/master/app/src/main/res)
- [ ] If there are new locales that are ready to be added to Release, add them to [l10n-release.toml](https://github.com/mozilla-mobile/fenix/blob/main/l10n-release.toml)
- [ ] Run the [L10N uplift script](https://github.com/mozilla-mobile/fenix/blob/main/l10n-uplift.py) against the releases/vX.1 branch (releases/v85.0.0). There will likely be conflicts, but if you are confused, they should match the strings in [main/Nightly](https://github.com/mozilla-mobile/fenix/tree/main/app/src/main/res)
- [ ] Once all conflicts are resolved, tag a new Beta to be released.
- [ ] Notify delphine in the L10N issue that the strings have been uplifted, and string quarantine can be lifted

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          path: main
          ref: master
          ref: main
      - name: "Checkout Beta Branch"
        uses: actions/checkout@v2
        with:
@@ -40,6 +40,6 @@ jobs:
          token: ${{ secrets.GITHUB_TOKEN }}
          path: beta
          branch: automation/sync-strings-${{ steps.fenix-beta-version.outputs.major-beta-version }}
          title: "Sync Strings from master to releases_${{steps.fenix-beta-version.outputs.fenix-beta-version}}.0"
          body: "This (automated) PR syncs strings from `master` to `releases_${{steps.fenix-beta-version.outputs.fenix-beta-version}}.0.0`"
          title: "Sync Strings from main to releases_${{steps.fenix-beta-version.outputs.fenix-beta-version}}.0"
          body: "This (automated) PR syncs strings from `main` to `releases_${{steps.fenix-beta-version.outputs.fenix-beta-version}}.0.0`"
          labels: needs:review
+4 −4
Original line number Diff line number Diff line
pipeline {
    agent any
    triggers {
        cron(env.BRANCH_NAME == 'master' ? 'H 0 * * *' : '')
        cron(env.BRANCH_NAME == 'main' ? 'H 0 * * *' : '')
    }
    options {
        timestamps()
@@ -9,7 +9,7 @@ pipeline {
    }
    stages {
        stage('test') {
        when { branch 'master' }
        when { branch 'main' }
            steps {
                dir('app/src/androidTest/java/org/mozilla/fenix/syncIntegration') {
                    sh 'pipenv install'
@@ -22,7 +22,7 @@ pipeline {
    post {
        always {
            script {
                 if (env.BRANCH_NAME == 'master') {
                 if (env.BRANCH_NAME == 'main') {
                 publishHTML(target: [
                     allowMissing: false,
                     alwaysLinkToLastBuild: true,
@@ -36,7 +36,7 @@ pipeline {

        failure {
            script {
                if (env.BRANCH_NAME == 'master') {
                if (env.BRANCH_NAME == 'main') {
                    slackSend(
                        color: 'danger',
                        message: "FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL}HTML_20Report/)")
+3 −3
Original line number Diff line number Diff line
# Firefox for Android

[![Task Status](https://github.taskcluster.net/v1/repository/mozilla-mobile/fenix/master/badge.svg)](https://github.taskcluster.net/v1/repository/mozilla-mobile/fenix/master/latest)
[![codecov](https://codecov.io/gh/mozilla-mobile/fenix/branch/master/graph/badge.svg)](https://codecov.io/gh/mozilla-mobile/fenix)
[![Task Status](https://github.taskcluster.net/v1/repository/mozilla-mobile/fenix/main/badge.svg)](https://github.taskcluster.net/v1/repository/mozilla-mobile/fenix/main/latest)
[![codecov](https://codecov.io/gh/mozilla-mobile/fenix/branch/main/graph/badge.svg)](https://codecov.io/gh/mozilla-mobile/fenix)

Fenix (internal codename) is the all-new Firefox for Android browser, based on [GeckoView](https://mozilla.github.io/geckoview/) and [Mozilla Android Components](https://mozac.org/).

@@ -207,7 +207,7 @@ See a [demo of auto-publication workflow in action](https://www.youtube.com/watc

In order to build successfully, you need to check out a commit in the dependency repository that has no breaking changes. The two best ways to do this are:
- Run the `<android-components>/tools/list_compatible_dependency_versions.py` script to output a compatible commit
- Check out the latest commit from master in this repository and the dependency repository. However, this may fail if there were breaking changes added recently to the dependency.
- Check out the latest commit from main in this repository and the dependency repository. However, this may fail if there were breaking changes added recently to the dependency.

### Using Nimbus servers during local development
If you're working with the Nimbus experiments platform, by default for local development Fenix configures Nimbus to not use a server.
+4 −4
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ import java.util.concurrent.TimeUnit
 * this will default to the tag on origin with the highest version name.
 *
 * To run this script:
 * - Update local master
 * - Update local main
 * - From project root, run `kotlinc -script automation/releasetools/PrintMentionedIssuesAndPrs.kts`
 *
 * TODO
 * - Use origin/master, instead of local master
 * - Use origin/main, instead of local main
 * - Interface with the GitHub API to filter out references to PRs
 * - Pull down issue names for each, to make constructing the changelog easier
 */
@@ -51,8 +51,8 @@ fun getHighestVersionedTag(): String {

fun getMostRecentCommonAncestorWithMaster(tag: String): String {
    runCommand("git fetch $origin --tags")
    // TODO use origin master
    return runCommand("git merge-base master $tag").trim()
    // TODO use origin main
    return runCommand("git merge-base main $tag").trim()
}

fun gitLogSince(sha: String): String {
Loading