fix: fix issue in new automerge scripts (#1056)

* fix: fix issue in new scripts

* fix: Remove label requirement for manual run script

* fix: Revert version of plugin

* fix: add env variables

* fix: move env definition?

* fix: trying to get the key to work for browserstack

* fix: use a different package

* fix: Move commands out of browserstack script

* fix: rename env variables

* fix: Update both regression scripts

* fix: add support for run e2e label; remove duplication of script

* fix: Don't need the browserstack keys anymore in automerge

* fix: allow manual running of script

* fix: remove dependency

Author: castastrophe

.github/workflows/automerge.yml

@@ -8,46 +8,8 @@ on:
     types: [completed]
     status: success
 jobs:
-  visual_regression_tests:
-    if: contains(github.event.pull_request.labels.*.name, 'ready to merge')
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [12.x]
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Cache node modules
-        uses: actions/cache@v2
-        env:
-          cache-name: cache-node-modules
-        with:
-          # npm cache files are stored in `~/.npm` on Linux/macOS
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: Install Dependencies
-        run: npm install
-
-      - name: Build
-        run: npm build
-
-      - name: Visual regression tests
-        uses: ianwalter/[email protected]
-        with:
-          args: npm run e2e -- --verbose
-        env:
-          BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_KEY }}
-          BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USER }}
-          CI: true
-          firefox: latest
-          chrome: stable
   try_to_merge:
-    if: success() && contains(github.event.pull_request.labels.*.name, 'ready to merge')
+    if: contains(github.event.pull_request.labels.*.name, 'ready to merge')
     runs-on: ubuntu-latest
     steps:
       - name: Try to automerge PR ${{ github.event.number }}

.github/workflows/visualtests.yml

@@ -1,13 +1,27 @@
 name: Visual regression testing
-on: [workflow_dispatch]
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [labeled]
+env:
+  BROWSERSTACK_KEY: ${{ secrets.BROWSERSTACK_KEY }}
+  BROWSERSTACK_USER: ${{ secrets.BROWSERSTACK_USER }}
 jobs:
   visual_regression_tests:
-    if: contains(github.event.pull_request.labels.*.name, 'ready to merge')
+    if: github.event.inputs.manual == true || contains(github.event.pull_request.labels.*.name, 'ready to merge')  || contains(github.event.pull_request.labels.*.name, 'run e2e')
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [12.x]
     steps:
+      - name: BrowserStackLocal env setup
+        uses: "browserstack/github-actions/setup-env@master"
+        with:
+          username: ${{ secrets.BROWSERSTACK_USER }}
+          access-key: ${{ secrets.BROWSERSTACK_KEY }}
+          build-name: BUILD_INFO
+          project-name: REPO_NAME
+
       - uses: actions/checkout@v2
 
       - name: Cache node modules
@@ -23,19 +37,23 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
+      - name: Start BrowserStackLocal
+        uses: "browserstack/github-actions/setup-local@master"
+        with:
+          local-testing: start
+          local-identifier: random
+          # local-logging-level: all-logs
+
       - name: Install Dependencies
         run: npm install
 
       - name: Build
-        run: npm build
+        run: npm run build
 
       - name: Visual regression tests
-        uses: ianwalter/[email protected]
+        run: npm run e2e -- --verbose
+
+      - name: Stop BrowserStackLocal
+        uses: "browserstack/github-actions/setup-local@master"
         with:
-          args: npm run e2e -- --verbose
-        env:
-          BROWSERSTACK_ACCESS_KEY: ${{ secrets.BROWSERSTACK_KEY }}
-          BROWSERSTACK_USERNAME: ${{ secrets.BROWSERSTACK_USER }}
-          CI: true
-          firefox: latest
-          chrome: stable
+          local-testing: stop