[pull] main from mozilla-mobile:main

.cron.yml

@@ -12,18 +12,19 @@ jobs:
       when:
           - {hour: 5, minute: 0}
           - {hour: 17, minute: 0}
+    - name: nightly-test
+      job:
+          type: decision-task
+          treeherder-symbol: Nt
+          target-tasks-method: nightly-test
+      when:
+        - {hour: 5, minute: 0}
     - name: fennec-production
       job:
           type: decision-task
           treeherder-symbol: fennec-production
           target-tasks-method: fennec-production
       when: []  # Force hook only
-    - name: bump-android-components
-      job:
-          type: decision-task
-          treeherder-symbol: bump-ac
-          target-tasks-method: bump_android_components
-      when: [{hour: 15, minute: 30}]
     - name: screenshots
       job:
           type: decision-task
@@ -35,4 +36,4 @@ jobs:
           type: decision-task
           treeherder-symbol: legacy-api-ui
           target-tasks-method: legacy_api_ui_tests
-      when: [{hour: 10, minute: 30}]
+      when: [{hour: 10, minute: 30}]

.editorconfig

@@ -1,4 +1,11 @@
 [*.{kt,kts}]
 # Disabling rules that were added in the latest versions of ktlint
 # tracking here: https://github.com/mozilla-mobile/fenix/issues/4861
-disabled_rules=import-ordering
+
+ktlint_disabled_rules=import-ordering
+
+ij_kotlin_allow_trailing_comma_on_call_site=true
+ij_kotlin_allow_trailing_comma=true
+
+[*]
+insert_final_newline = true

.experimenter.yaml

@@ -1,15 +1,4 @@
 ---
-engine-settings:
-  description: Contains a set of settings for controlling the web engine configurations.
-  hasExposure: true
-  exposureDescription: ""
-  variables:
-    tabs-prioritization-enabled:
-      type: boolean
-      description: "If true, enables tabs prioritization feature."
-    total-cookie-protection-enabled:
-      type: boolean
-      description: "If true, enables the total cookie protection in all browsing modes."
 homescreen:
   description: The homescreen that the user goes to when they press home or new tab.
   hasExposure: true
@@ -44,6 +33,14 @@ messaging:
     triggers:
       type: json
       description: "A collection of out the box trigger expressions. Each entry maps to a valid JEXL expression.\n"
+mr2022:
+  description: Features for MR 2022.
+  hasExposure: true
+  exposureDescription: ""
+  variables:
+    sections-enabled:
+      type: json
+      description: This property provides a lookup table of whether or not the given section should be enabled.
 nimbus-validation:
   description: A feature that does not correspond to an application feature suitable for showing that Nimbus is working. This should never be used in production.
   hasExposure: true
@@ -58,14 +55,6 @@ nimbus-validation:
     settings-title:
       type: string
       description: The title of displayed in the Settings screen and app menu.
-pocket-sponsored-stories:
-  description: A feature showing sponsored stories in between the other Pocket recommended stories on homescreen.
-  hasExposure: true
-  exposureDescription: ""
-  variables:
-    enabled:
-      type: boolean
-      description: "If true, the Pocket stories shown on homescreen should contain sponsored stories also."
 search-term-groups:
   description: A feature allowing the grouping of URLs around the search term that it came from.
   hasExposure: true

.github/PULL_REQUEST_TEMPLATE

@@ -8,13 +8,14 @@
 
 ### QA
 <!-- Before submitting the PR, please address each item -->
-- [ ] **QA Needed**
+- [x] **QA Needed**
 
-### To download an APK when reviewing a PR:
-1. click on Show All Checks,
-2. click Details next to "Taskcluster (pull_request)" after it appears and then finishes with a green checkmark,
-3. click on the "Fenix - assemble" task, then click "Run Artifacts".
-4. the APK links should be on the left side of the screen, named for each CPU architecture
+### To download an APK when reviewing a PR (after all CI tasks finished running):
+1. Click on `Checks` at the top of the PR page.
+2. Click on the `firefoxci-taskcluster` group on the left to expand all tasks.
+3. Click on the `build-debug` task.
+4. Click on `View task in Taskcluster` in the new `DETAILS` section.
+5. The APK links should be on the right side of the screen, named for each CPU architecture.
 
 ### GitHub Automation
 <!-- Do not add anything below this line -->

.github/workflows/sync-strings.yml

@@ -15,10 +15,10 @@ jobs:
     steps:
       - name: "Discover Fenix Beta Version"
         id: fenix-beta-version
-        uses: mozilla-mobile/fenix-beta-version@2.0.0
+        uses: mozilla-mobile/fenix-beta-version@4.1.0
       - name: "Skip non-beta versions"
         uses: andymckay/cancel-action@0.2
-        if: ${{ steps.fenix-beta-version.outputs.fenix-beta-version == '' }}
+        if: ${{ steps.fenix-beta-version.outputs.beta_version == '' }}
       - name: "Checkout Master Branch"
         uses: actions/checkout@v2
         with:
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           path: beta
-          ref: "releases_v${{ steps.fenix-beta-version.outputs.fenix-beta-version }}.0.0"
+          ref: "releases_v${{ steps.fenix-beta-version.outputs.beta_version }}.0.0"
       - name: "Sync Strings"
         uses: mozilla-mobile/sync-strings-action@1.0.1
         with:
@@ -39,7 +39,6 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           path: beta
-          branch: automation/sync-strings-${{ steps.fenix-beta-version.outputs.major-beta-version }}
-          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
+          branch: automation/sync-strings-${{ steps.fenix-beta-version.outputs.beta_version }}
+          title: "Sync Strings from main to releases_${{steps.fenix-beta-version.outputs.beta_version}}.0"
+          body: "This (automated) PR syncs strings from `main` to `releases_${{steps.fenix-beta-version.outputs.beta_version}}.0.0`"

.github/workflows/update-nimbus-experiments.yml

@@ -0,0 +1,39 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/
+
+name: "Update Nimbus Experiments"
+
+on:
+  schedule:
+    - cron: '*/30 * * * *'
+  workflow_dispatch: {}
+
+jobs:
+  update-nimbus-experiments:
+    name: "Update Nimbus Experiments"
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout Main Branch"
+        uses: actions/checkout@v2
+        with:
+          path: fenix
+          ref: main
+      - name: "Update Experiments JSON"
+        id: update-experiments-json
+        uses: mozilla-mobile/update-experiments@v1
+        with:
+          repo-path: fenix
+          output-path: app/src/main/res/raw/initial_experiments.json
+          experimenter-url: https://experimenter.services.mozilla.com/api/v6/experiments/?is_first_run=true
+          app-name: fenix
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          path: fenix
+          branch: automation/update-nimbus-experiments
+          commit-message: "update initial_experiments.json based on the current first-run experiments in experimenter"
+          title: "Update initial experiments JSON for Nimbus"
+          body: "This (automated) PR updates the initial_experiments.json on the `main` branch"
+          delete-branch: true

.mergify.yml

@@ -1,101 +1,83 @@
 queue_rules:
   - name: default
     conditions:
-      - status-success=pr-complete
+      - or:
+        - status-success=complete-pr
+        - and:
+          # For more context, see "Auto Merge" rules down below
+          - status-success=complete-push
+          - or:
+            - and:
+              - base~=^releases[_/].*
+              - or:
+                - head~=^automation/sync-strings-\d+
+                - head~=^relbot/fenix-\d+
+            - and:
+              - base=main
+              - head~=^relbot/AC-Nightly-.+
 pull_request_rules:
   - name: Resolve conflict
     conditions:
       - conflict
     actions:
         comment:
           message: This pull request has conflicts when rebasing. Could you fix it @{{author}}? 🙏
-  - name: MickeyMoz - Auto Merge
+  - name: Android-Components bump - Auto Merge
     conditions:
-      - author=MickeyMoz
-      - status-success=pr-complete
-      - files~=(Gecko.kt|AndroidComponents.kt)
+      - and:
+        - files=buildSrc/src/main/java/AndroidComponents.kt
+        - -files~=^(?!buildSrc/src/main/java/AndroidComponents.kt).+$
+        - author=github-actions[bot]
+        - status-success=complete-push
+        - or:
+          - and:
+            - base=main
+            - head~=^relbot/AC-Nightly-.+
+          - and:
+            - base~=^releases[_/].*
+            - head~=^relbot/fenix-\d+
     actions:
       review:
         type: APPROVE
-        message: MickeyMoz 💪
+        message: 🚢
       queue:
         method: rebase
         name: default
         rebase_fallback: none
   - name: L10N - Auto Merge
     conditions:
-      - author=mozilla-l10n-automation-bot
-      - status-success=pr-complete
-      - files~=(strings.xml|l10n.toml)
+      - and:
+        - files~=^(l10n.toml|app/src/main/res/values[A-Za-z-]*/strings\.xml)$
+        # /!\ The line above doesn't prevent random files to be changed alongside
+        # l10n ones. That's why the additional condition exists below. For more
+        # information: https://docs.mergify.com/conditions/#how-to-match-lists
+        - -files~=^(?!(l10n.toml|app/src/main/res/values[A-Za-z-]*/strings\.xml)).+$
+        - or:
+          - and:
+            - author=mozilla-l10n-automation-bot
+            - base=main
+            - head=import-l10n
+            - status-success=complete-pr
+          - and:
+            - author=github-actions[bot]
+            - base~=^releases[_/].*
+            - head~=^automation/sync-strings-\d+
+            - status-success=complete-push
+            # Taskcluster only runs on git-push events because github-actions[bot] is not considered
+            # a collaborator, so pull request events are triggered. That said, github-actions[bot]
+            # doesn't create the PR on a separate fork (unlike mozilla-l10n-automation-bot). That's
+            # why git-push events are taken into account
     actions:
       review:
         type: APPROVE
         message: LGTM 😎
       queue:
-        method: rebase
-        name: default
-        rebase_fallback: none
-  - name: Release automation (Old)
-    conditions:
-      - base~=releases[_/].*
-      - author=github-actions[bot]
-      # Listing checks manually beause we do not have a "push complete" check yet.
-      - check-success=build-android-test-debug
-      - check-success=build-debug
-      - check-success=build-nightly-simulation
-      - check-success=lint-compare-locales
-      - check-success=lint-detekt
-      - check-success=lint-ktlint
-      - check-success=lint-lint
-      - check-success=signing-android-test-debug
-      - check-success=signing-debug
-      - check-success=signing-nightly-simulation
-      - check-success=test-debug
-      - check-success=ui-test-x86-debug
-      - files~=(AndroidComponents.kt)
-    actions:
-      review:
-        type: APPROVE
-        message: 🚢
-      queue:
-        method: rebase
-        name: default
-        rebase_fallback: none
-      delete_head_branch:
-        force: false
-  - name: Release automation (New)
-    conditions:
-      - base~=releases[_/].*
-      - author=github-actions[bot]
-      # Listing checks manually beause we do not have a "push complete" check yet.
-      - check-success=build-android-test-beta
-      - check-success=build-android-test-debug
-      - check-success=build-beta-firebase
-      - check-success=build-debug
-      - check-success=build-nightly-simulation
-      - check-success=lint-compare-locales
-      - check-success=lint-detekt
-      - check-success=lint-ktlint
-      - check-success=lint-lint
-      - check-success=signing-android-test-beta
-      - check-success=signing-beta-firebase
-      - check-success=signing-nightly-simulation
-      - check-success=test-debug
-      - check-success=ui-test-x86-beta
-      - files~=(AndroidComponents.kt)
-    actions:
-      review:
-        type: APPROVE
-        message: 🚢
-      queue:
-        method: rebase
+        method: squash
         name: default
         rebase_fallback: none
-      delete_head_branch:
-        force: false
   - name: Needs landing - Rebase
     conditions:
-      - check-success=pr-complete
+      - check-success=complete-pr
       - label=pr:needs-landing
       - "#approved-reviews-by>=1"
       - -draft
@@ -108,8 +90,8 @@ pull_request_rules:
         rebase_fallback: none
   - name: Needs landing - Squash
     conditions:
-      - check-success=pr-complete
-      - label=pr:needs-landing-squashed 
+      - check-success=complete-pr
+      - label=pr:needs-landing-squashed
       - "#approved-reviews-by>=1"
       - -draft
       - label!=pr:work-in-progress