From 57354557917e216941cc7f057683550c33663043 Mon Sep 17 00:00:00 2001
From: Dima Zaytsev <dmitry.zaicew@gmail.com>
Date: Mon, 29 Aug 2022 21:25:54 +0200
Subject: [PATCH] Integrated latest workflow

---
 .experimenter.json             | 42 +++++++++++++++++-----------------
 .github/workflows/workflow.yml |  6 ++++-
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/.experimenter.json b/.experimenter.json
index b222334ef94c..ca54f95c1c10 100644
--- a/.experimenter.json
+++ b/.experimenter.json
@@ -1,23 +1,12 @@
 {
-  "homescreen": {
-    "description": "The homescreen that the user goes to when they press home or new tab.",
-    "hasExposure": true,
-    "exposureDescription": "",
-    "variables": {
-      "sections-enabled": {
-        "description": "This property provides a lookup table of whether or not the given section should be enabled. If the section is enabled, it should be toggleable in the settings screen, and on by default.",
-        "type": "json"
-      }
-    }
-  },
-  "default-browser-message": {
-    "description": "A small feature allowing experiments on the placement of a default browser message.",
+  "search-term-groups": {
+    "description": "A feature allowing the grouping of URLs around the search term that it came from.",
     "hasExposure": true,
     "exposureDescription": "",
     "variables": {
-      "message-location": {
-        "description": "Where is the message to be put.",
-        "type": "string"
+      "enabled": {
+        "description": "If true, the feature shows up on the homescreen and on the new tab screen.",
+        "type": "boolean"
       }
     }
   },
@@ -40,14 +29,25 @@
       }
     }
   },
-  "search-term-groups": {
-    "description": "A feature allowing the grouping of URLs around the search term that it came from.",
+  "homescreen": {
+    "description": "The homescreen that the user goes to when they press home or new tab.",
     "hasExposure": true,
     "exposureDescription": "",
     "variables": {
-      "enabled": {
-        "description": "If true, the feature shows up on the homescreen and on the new tab screen.",
-        "type": "boolean"
+      "sections-enabled": {
+        "description": "This property provides a lookup table of whether or not the given section should be enabled. If the section is enabled, it should be toggleable in the settings screen, and on by default.",
+        "type": "json"
+      }
+    }
+  },
+  "default-browser-message": {
+    "description": "A small feature allowing experiments on the placement of a default browser message.",
+    "hasExposure": true,
+    "exposureDescription": "",
+    "variables": {
+      "message-location": {
+        "description": "Where is the message to be put.",
+        "type": "string"
       }
     }
   }
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index a2253ca3e745..85023223e71f 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -2,6 +2,10 @@ name: Build and Upload
 
 on:
   workflow_dispatch:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
 
 jobs:
   build:
@@ -10,7 +14,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: gradle/gradle-build-action@v2
     - run: ./gradlew packageNightly
-    - uses: mobile-dev-inc/action-upload@vdev-v2
+    - uses: mobile-dev-inc/action-upload@v2.1.0
       with:
         api-key: ${{ secrets.MOBILE_DEV_API_KEY }}
         name: ${{ github.sha }}