Merge pull request #393 from fork-maintainers/upstream-sync

Sync with Mozilla Firefox v92.1.1

.github/CODEOWNERS

@@ -50,4 +50,8 @@
 # Possible regressions throughout the app
 *.pro @mozilla-mobile/Performance
 *proguard* @mozilla-mobile/Performance
+
+# This file configures perf tests via Jetpack Benchmark.
+app/benchmark.gradle @mozilla-mobile/Performance
+
 # --- PERFORMANCE END --- #

.github/ISSUE_TEMPLATE/---bug-report.yml

@@ -0,0 +1,91 @@
+name: "\U0001F41E Bug report"
+description: Create a report to help us improve.
+title: "[Bug]: "
+labels: ["\U0001F41E bug", "needs:triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        - Please do your best to search for duplicate issues before filing a new issue so we can keep our issue board clean.
+        - Have a look at ["I want to file an issue!"][info] for more information.
+        - Read the [Community Participation Guidelines][guidelines] and the [Bugzilla Etiquette guidelines][bugzilla] before filing an issue.
+
+        [info]: https://github.com/mozilla-mobile/fenix#i-want-to-file-an-issue
+        [guidelines]: https://www.mozilla.org/en-US/about/governance/policies/participation/
+        [bugzilla]: https://bugzilla.mozilla.org/page.cgi?id=etiquette.html
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: Steps to reproduce the behaviour.
+      placeholder: |
+        1. Have a tab open..
+        2. Go to..
+        3. Click on..
+        4. Observe..
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected behaviour
+      placeholder: A menu should open..
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual behaviour
+      placeholder: The app closes unexpectedly..
+    validations:
+      required: true
+  - type: markdown
+    attributes:
+      value: |
+        # Device information
+  - type: input
+    attributes:
+      label: Device name
+      description: The name of the device model and manufacturer.
+      placeholder: Google Pixel 2
+    validations:
+      required: false
+  - type: input
+    attributes:
+      label: Android version
+      description: You can find the Android version information in the About section of your device's system settings.
+      placeholder: Android 10
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Firefox release type
+      description: You can find this information in Settings -> About Firefox.
+      options:
+        - Firefox Nightly
+        - Firefox Beta
+        - Firefox
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Firefox version
+      description: You can find this information in Settings -> About Firefox.
+      placeholder: 89.0.10
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Device logs
+      description: |
+        Device logs or crash information can greatly aid in debugging. You can find some details here on how to [retrieve device logs or crash IDs][log].
+
+        [log]: https://github.com/mozilla-mobile/fenix/wiki/Logging-Crash-Information
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: |
+        If you have any additional information for us, use the field below.
+        Please note, you can attach screenshots or screen recordings here, by
+        dragging and dropping files in the field below.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/release_checklist.md

@@ -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,16 +41,16 @@ 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)
     - [ ] Check Sentry each day for issues on [Firefox Beta](https://sentry.prod.mozaws.net/operations/firefox-beta/) and if nothing concerning, bump release in the bugzilla (5%, 20%, 100%)
 
 ### 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
 

.github/stale.yml

@@ -14,6 +14,7 @@ onlyLabels: []
 exemptLabels:
   - pin
   - "feature request 🌟"
+  - "eng:disabled-test"
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: false

.github/workflows/build-contributor-pr.yml

@@ -10,7 +10,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: "Clean & Assemble Debug"
         uses: eskatos/gradle-command-action@v1
         with:
@@ -29,7 +29,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: "Test Debug Unit Tests"
         uses: eskatos/gradle-command-action@v1
         with:
@@ -48,7 +48,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: "Detekt"
         uses: eskatos/gradle-command-action@v1
         with:
@@ -72,7 +72,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: "Ktlint"
         uses: eskatos/gradle-command-action@v1
         with:
@@ -91,7 +91,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
+          java-version: 11
       - name: "Lint Debug"
         uses: eskatos/gradle-command-action@v1
         with:
@@ -106,7 +106,7 @@ jobs:
           path: app/build/reports/lint-results-debug.html
 
   run-ui:
-    runs-on: macos-latest
+    runs-on: macos-11
     if: github.event.pull_request.head.repo.full_name != github.repository && github.actor != 'MickeyMoz'
 
     timeout-minutes: 60
@@ -125,7 +125,7 @@ jobs:
           arch: x86_64
           profile: pixel_3a
           script:
-            "./gradlew connectedDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=\
+            "JAVA_HOME=$JAVA_HOME_11_X64 && ./gradlew connectedDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=\
             org.mozilla.fenix.ui.NavigationToolbarTest#visitURLTest"
       - name: Upload Test Artifacts
         uses: actions/upload-artifact@v2

.github/workflows/sync-strings.yml

@@ -15,12 +15,15 @@ jobs:
     steps:
       - name: "Discover Fenix Beta Version"
         id: fenix-beta-version
-        uses: mozilla-mobile/fenix-beta-version@1.1.0
+        uses: mozilla-mobile/fenix-beta-version@2.0.0
+      - name: "Skip non-beta versions"
+        uses: andymckay/cancel-action@0.2
+        if: ${{ steps.fenix-beta-version.outputs.fenix-beta-version == '' }}
       - name: "Checkout Master Branch"
         uses: actions/checkout@v2
         with:
           path: main
-          ref: master
+          ref: main
       - name: "Checkout Beta Branch"
         uses: actions/checkout@v2
         with:
@@ -37,5 +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

.mergify.yml

@@ -86,3 +86,27 @@ pull_request_rules:
         strict: smart
       delete_head_branch:
         force: false
+  - name: Needs landing - Rebase
+    conditions:
+      - check-success=pr-complete
+      - label=pr:needs-landing
+      - "#approved-reviews-by>=1"
+      - -draft
+      - label!=pr:work-in-progress
+      - label!=pr:do-not-land
+    actions:
+      merge:
+        method: rebase
+        strict: smart
+  - name: Needs landing - Squash
+    conditions:
+      - check-success=pr-complete
+      - label=pr:needs-landing-squashed 
+      - "#approved-reviews-by>=1"
+      - -draft
+      - label!=pr:work-in-progress
+      - label!=pr:do-not-land
+    actions:
+      merge:
+        method: squash
+        strict: smart

.taskcluster.yml

@@ -8,7 +8,7 @@ tasks:
     - $let:
           taskgraph:
               branch: taskgraph
-              revision: a458418ef7cdd6778f1283926c6116966255bc24
+              revision: 9daff451cfbe82c5c70237a7b3dbcf4fd3238299
           trustDomain: mobile
       in:
           $let:
@@ -243,7 +243,7 @@ tasks:
                               # Note: This task is built server side without the context or tooling that
                               # exist in tree so we must hard code the hash
                               image:
-                                  mozillareleases/taskgraph:decision-mobile-682fbaa1ef17e70ddfe3457da3eaf8e776c4a20fe5bfbdbeba0641fd5bceae2a@sha256:bbb2613aaab79d17e590fbd78c072d0643be40fd1237195703f84280ecc3b302
+                                  mozillareleases/taskgraph:decision-mobile-44b6b7b4c370220eff56efa8b508aa5157ef9c6e74847c7ecc19d640946ba49e@sha256:4107cbc5e154502529e4d38efa4dc89c05ee54e2cbc6e2e66023e68407502894
 
                               maxRunTime: 1800
 
@@ -260,14 +260,14 @@ tasks:
                                     in:
                                         $if: 'tasks_for == "action"'
                                         then: >
-                                            PIP_IGNORE_INSTALLED=0 pip install --user /builds/worker/checkouts/taskgraph &&
-                                            PIP_IGNORE_INSTALLED=0 pip install --user mozilla-version &&
+                                            PIP_IGNORE_INSTALLED=0 pip3 install --user /builds/worker/checkouts/taskgraph &&
+                                            PIP_IGNORE_INSTALLED=0 pip3 install --user mozilla-version &&
                                             taskcluster/scripts/decision-install-sdk.sh &&
                                             ln -s /builds/worker/artifacts artifacts &&
                                             ~/.local/bin/taskgraph action-callback
                                         else: >
-                                            PIP_IGNORE_INSTALLED=0 pip install --user /builds/worker/checkouts/taskgraph &&
-                                            PIP_IGNORE_INSTALLED=0 pip install --user mozilla-version &&
+                                            PIP_IGNORE_INSTALLED=0 pip3 install --user /builds/worker/checkouts/taskgraph &&
+                                            PIP_IGNORE_INSTALLED=0 pip3 install --user mozilla-version &&
                                             taskcluster/scripts/decision-install-sdk.sh &&
                                             ln -s /builds/worker/artifacts artifacts &&
                                             ~/.local/bin/taskgraph decision

Jenkinsfile

@@ -1,15 +1,15 @@
 pipeline {
     agent any
     triggers {
-        cron(env.BRANCH_NAME == 'master' ? 'H 0 * * *' : '')
+        cron(env.BRANCH_NAME == 'main' ? 'H 0 * * *' : '')
     }
     options {
         timestamps()
         timeout(time: 1, unit: 'HOURS')
     }
     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/)")