Merge branch 'develop' into trunk

10up · Mar 20, 2022 · 8e0dd3c · 8e0dd3c
2 parents 2160d5a + c8fb346
commit 8e0dd3c
Show file tree

Hide file tree

Showing 53 changed files with 612 additions and 608 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -3,6 +3,7 @@
     "rules": {
         "import/no-unresolved": 0,
         "import/no-extraneous-dependencies": 0,
-        "react/jsx-props-no-spreading": 0
+        "react/jsx-props-no-spreading": 0,
+        "jsdoc/check-tag-names": 0
     }
 }
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -1,15 +1,7 @@
 name: Run E2E Test Suite 
 
 # Controls when the workflow will run
-on:
-  pull_request:
-
-  push:
-    branches:
-      - 'develop'
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+on: [ push, workflow_dispatch ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -44,4 +36,4 @@ jobs:
           env: video=false
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}