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)
releases_v92.0.0
Stefan Arentz 1 year ago committed by GitHub
parent 173786d6b6
commit 6a3adb5aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      .github/ISSUE_TEMPLATE/release_checklist.md
  2. 6
      .github/workflows/sync-strings.yml
  3. 8
      Jenkinsfile
  4. 6
      README.md
  5. 8
      automation/releasetools/PrintMentionedIssuesAndPrs.kts
  6. 2
      automation/taskcluster/update_android_components.sh
  7. 4
      docs/adjust.md
  8. 10
      docs/architecture-overview.md
  9. 8
      docs/crash-reporting.md
  10. 2
      docs/telemetry.md
  11. 2
      l10n-uplift.py
  12. 2
      l10n.toml
  13. 2
      settings.gradle
  14. 2
      taskcluster/ci/ui-test/kind.yml

@ -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

@ -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

8
Jenkinsfile vendored

@ -1,7 +1,7 @@
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/)")

@ -1,7 +1,7 @@
# 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.

@ -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 {

@ -59,7 +59,7 @@ if [[ $(hub pr list --head "$GITHUB_USER:$BRANCH") ]]; then
echo "There's already an open PR."
else
echo "No PR found. Opening new PR."
hub pull-request --base master --head "$GITHUB_USER:$BRANCH" --no-edit -m "Update Android Components version"
hub pull-request --base main --head "$GITHUB_USER:$BRANCH" --no-edit -m "Update Android Components version"
fi
unset GITHUB_TOKEN

@ -1,10 +1,10 @@
Firefox Preview tracks certain types of installs using a third-party install tracking framework called Adjust. The intention is to determine the origin of Firefox Preview installs by answering the question, “Did this user on this device install Firefox Preview in response to a specific advertising campaign performed by Mozilla?”
The framework consists of a software development kit (SDK) linked into Firefox Preview and a data-collecting Internet service backend run by the German company [adjust GmbH](https://www.adjust.com). The Adjust SDK is open source and MIT licensed. It is hosted at [https://github.com/adjust/android_sdk](https://github.com/adjust/android_sdk). Firefox Preview pulls in an unmodified copy of the SDK using Gradle. The [Dependencies.kt](https://github.com/mozilla-mobile/fenix/blob/master/buildSrc/src/main/java/Dependencies.kt#L39) contains the version of the framework that is being used. The SDK is documented at [https://docs.adjust.com](https://docs.adjust.com).
The framework consists of a software development kit (SDK) linked into Firefox Preview and a data-collecting Internet service backend run by the German company [adjust GmbH](https://www.adjust.com). The Adjust SDK is open source and MIT licensed. It is hosted at [https://github.com/adjust/android_sdk](https://github.com/adjust/android_sdk). Firefox Preview pulls in an unmodified copy of the SDK using Gradle. The [Dependencies.kt](https://github.com/mozilla-mobile/fenix/blob/main/buildSrc/src/main/java/Dependencies.kt#L39) contains the version of the framework that is being used. The SDK is documented at [https://docs.adjust.com](https://docs.adjust.com).
## Adjust Integration
The Adjust framework is abstracted via the [AdjustMetricService](https://github.com/mozilla-mobile/fenix/blob/master/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt) class. All interaction with Adjust happens via this class.
The Adjust framework is abstracted via the [AdjustMetricService](https://github.com/mozilla-mobile/fenix/blob/main/app/src/main/java/org/mozilla/fenix/components/metrics/AdjustMetricsService.kt) class. All interaction with Adjust happens via this class.
## Adjust Messages

@ -12,7 +12,7 @@ Our largest deviation from these architectures is that while they each recommend
#### Overview
A store of state
See [mozilla.components.lib.state.Store](https://github.com/mozilla-mobile/android-components/blob/master/components/lib/state/src/main/java/mozilla/components/lib/state/Store.kt)
See [mozilla.components.lib.state.Store](https://github.com/mozilla-mobile/android-components/blob/main/components/lib/state/src/main/java/mozilla/components/lib/state/Store.kt)
Pushes changes to: [View](#view)
@ -25,7 +25,7 @@ It is recommended that consumers rely as much as possible on `consumeFrom(store)
Note that there is one Store for any given screen, and only one will be active at any given time. Stores are persisted across configuration changes, but created and destroyed during fragment transactions. This means that data that must be shared across Stores must be passed as arguments to the new fragment.
Stores should be created using [StoreProvider#get](https://github.com/mozilla-mobile/fenix/blob/master/app/src/main/java/org/mozilla/fenix/components/StoreProvider.kt).
Stores should be created using [StoreProvider#get](https://github.com/mozilla-mobile/fenix/blob/main/app/src/main/java/org/mozilla/fenix/components/StoreProvider.kt).
-------
@ -33,7 +33,7 @@ Stores should be created using [StoreProvider#get](https://github.com/mozilla-mo
#### Overview
Simple description of a state change
See [mozilla.components.lib.state.Action](https://github.com/mozilla-mobile/android-components/blob/master/components/lib/state/src/main/java/mozilla/components/lib/state/Action.kt)
See [mozilla.components.lib.state.Action](https://github.com/mozilla-mobile/android-components/blob/main/components/lib/state/src/main/java/mozilla/components/lib/state/Action.kt)
Created by: [Controller](#controller)
@ -48,7 +48,7 @@ Simple data object that carries information about a [State](#state) change to a
#### Overview
Description of the state of a screen
See [mozilla.components.lib.state.State](https://github.com/mozilla-mobile/android-components/blob/master/components/lib/state/src/main/java/mozilla/components/lib/state/State.kt)
See [mozilla.components.lib.state.State](https://github.com/mozilla-mobile/android-components/blob/main/components/lib/state/src/main/java/mozilla/components/lib/state/State.kt)
Referenced by: [Store](#store)
@ -67,7 +67,7 @@ This also gives us a major advantage when debugging. If the UI looks wrong, chec
#### Overview
Pure function used to create new [State](#state) objects
See [mozilla.components.lib.state.Reducer](https://github.com/mozilla-mobile/android-components/blob/master/components/lib/state/src/main/java/mozilla/components/lib/state/Store.kt)
See [mozilla.components.lib.state.Reducer](https://github.com/mozilla-mobile/android-components/blob/main/components/lib/state/src/main/java/mozilla/components/lib/state/Store.kt)
Referenced by: [Store](#store)

@ -4,23 +4,23 @@ Firefox for Android uses a few libraries for crash and exception reporting. This
This page documents the types of crash reporting, how the various parts interact, and what kind of data is sent back to Mozilla.
Documentation for the specific libraries is included in the [Android Components Crash Reporting README](https://github.com/mozilla-mobile/android-components/blob/master/components/lib/crash/README.md).
Documentation for the specific libraries is included in the [Android Components Crash Reporting README](https://github.com/mozilla-mobile/android-components/blob/main/components/lib/crash/README.md).
## Glean crash ping
[Glean SDK](https://mozilla.github.io/glean/book/index.html) is a Mozilla open source telemetry library, which Firefox for Android uses to collect app telemetry. It can also collect crash counts as a labeled counter with each label corresponding to a specific type of crash (such as `native_code_crash`, `unhandled_exception`).
The Glean crash ping format is documented [here](https://github.com/mozilla-mobile/android-components/blob/master/components/lib/crash/docs/metrics.md).
The Glean crash ping format is documented [here](https://github.com/mozilla-mobile/android-components/blob/main/components/lib/crash/docs/metrics.md).
To opt in or out of Glean telemetry reporting, visit the Data collection menu under Settings.
## Breadcrumbs
[Breadcrumbs](https://github.com/mozilla-mobile/android-components/blob/master/components/support/base/src/main/java/mozilla/components/support/base/crash/Breadcrumb.kt) are trail of events that are sent with each crash report to both Socorro and Sentry.
[Breadcrumbs](https://github.com/mozilla-mobile/android-components/blob/main/components/support/base/src/main/java/mozilla/components/support/base/crash/Breadcrumb.kt) are trail of events that are sent with each crash report to both Socorro and Sentry.
### Events
In [HomeActivity](https://github.com/mozilla-mobile/fenix/blob/master/app/src/main/java/org/mozilla/fenix/HomeActivity.kt) when `onDestinationChanged` occurs, the destination fragment's name and and whether it is a custom tab is added to the breadcrumbs.
In [HomeActivity](https://github.com/mozilla-mobile/fenix/blob/main/app/src/main/java/org/mozilla/fenix/HomeActivity.kt) when `onDestinationChanged` occurs, the destination fragment's name and and whether it is a custom tab is added to the breadcrumbs.
## Socorro

@ -10,4 +10,4 @@ Additional metrics or pings defined by Fenix are documented in the [Glean Dictio
## Crash reporting
See [here](https://github.com/mozilla-mobile/fenix/blob/master/docs/crash-reporting.md) for details on crash reporting in Firefox for Android.
See [here](https://github.com/mozilla-mobile/fenix/blob/main/docs/crash-reporting.md) for details on crash reporting in Firefox for Android.

@ -14,7 +14,7 @@ import subprocess
import argparse
# TODO don't forget to change this once we switch to 'main' or whatever other name.
MAIN_BRANCH="master"
MAIN_BRANCH="main"
L10N_AUTHOR="release+l10n-automation-bot@mozilla.com"
def run_cmd_checked(*args, **kwargs):

@ -113,7 +113,7 @@ locales = [
# Expose the following branches to localization
# Changes to this list should be announced to the l10n team ahead of time.
branches = [
"master",
"main",
]
[env]

@ -33,7 +33,7 @@ if (file('local.properties').canRead()) {
localProperties.load(file('local.properties').newDataInputStream())
log('Loaded local.properties')
} else {
log('Missing local.properties; see https://github.com/mozilla-mobile/fenix/blob/master/README.md#local-properties-helpers for instructions.')
log('Missing local.properties; see https://github.com/mozilla-mobile/fenix/blob/main/README.md#local-properties-helpers for instructions.')
}
if (localProperties != null) {

@ -60,7 +60,7 @@ jobs:
screenshots: true
description: Run UI screenshots tests to keep them up to date
run-on-tasks-for: []
run-on-git-branches: [master]
run-on-git-branches: [main]
run:
commands:
- [automation/taskcluster/androidTest/ui-test.sh, x86-screenshots-tests, app.apk, android-test.apk, '-1']

Loading…
Cancel
Save