Merge branch 'develop' into feature/validateVariables

Author: mikepsinn

.github/workflows/autoupdate.yaml

@@ -0,0 +1,22 @@
+name: autoupdate
+on:
+ push:
+   branches:
+     - feature/*
+jobs:
+    autoupdate:
+        name: autoupdate
+        runs-on: ubuntu-18.04
+        steps:
+            - uses: docker://chinthakagodawita/autoupdate-action:v1
+              env:
+                  GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+                  # See https://github.com/marketplace/actions/auto-update for options
+#                  DRY_RUN: "false"
+#                  PR_FILTER: "labelled"
+#                  PR_LABELS: "keep up-to-date,integration"
+#                  EXCLUDED_LABELS: "dependencies"
+#                  MERGE_MSG: "Branch was auto-updated."
+#                  RETRY_COUNT: "5"
+#                  RETRY_SLEEP: "300"
+#                  MERGE_CONFLICT_ACTION: "fail"

package-lock.json

@@ -19,7 +19,7 @@
     "@slack/types": "1.9.0",
     "@slack/webhook": "5.0.3",
     "angular": "latest",
-    "aws-sdk": "2.940.0",
+    "aws-sdk": "2.941.0",
     "aws-sdk-mock": "4.5.0",
     "beautify": "0.0.8",
     "chai": "4.3.4",
@@ -37,7 +37,7 @@
     "cordova-plugin-x-socialsharing": "6.0.3",
     "coveralls": "3.1.1",
     "cross-env": "6.0.3",
-    "cypress": "7.5.0",
+    "cypress": "7.6.0",
     "cypress-cucumber-preprocessor": "4.1.3",
     "cypress-failed-log": "2.9.2",
     "cypress-intellij-reporter": "0.0.6",

package.json

@@ -11,4 +11,4 @@ else
 	echo "success-file exists so running ghostinspector tests..."
 fi
 # shellcheck source=./log_end.sh
-source "$IONIC_PATH"/scripts/log_end.sh
+source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}"

scripts/cypress_run.sh

@@ -6,4 +6,4 @@ source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}"
 set -xe
 npm run test:ghostinspector
 # shellcheck source=./log_end.sh
-source "$IONIC_PATH"/scripts/log_end.sh
+source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}"

scripts/ghost-inspector.sh

@@ -8,4 +8,4 @@ set -xe
 source "$SCRIPT_FOLDER"/no-root.sh
 git push [email protected]:medimodo.git HEAD:master -f;
 # shellcheck source=./log_end.sh
-source "$IONIC_PATH"/scripts/log_end.sh
+source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}"

scripts/heroku.sh

@@ -7,4 +7,4 @@ set -xe
 npm run types
 npm run test:mocha
 # shellcheck source=./log_end.sh
-source "$IONIC_PATH"/scripts/log_end.sh
+source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}"

scripts/mocha.sh

@@ -20,4 +20,4 @@ source "${SCRIPT_FOLDER}"/cypress_run.sh
 # shellcheck source=./ghost-inspector.sh
 source "${SCRIPT_FOLDER}"/ghost-inspector.sh
 # shellcheck source=./log_end.sh
-source "$IONIC_PATH"/scripts/log_end.sh
+source "$IONIC_PATH"/scripts/log_end.sh "${BASH_SOURCE[0]}"