Merge branch 'develop' into feature/validateVariables

QuantiModo · Jul 5, 2021 · 264fdea · 264fdea · mikepsinn · Jul 5, 2021
2 parents 0c04503 + 41b5d99
commit 264fdea
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -314,7 +314,7 @@ var qmGit = {
     outputCommitMessageAndBranch: function () {
         qmGit.getCommitMessage(function (commitMessage) {
             qmGit.setBranchName(function () {
-                qmLog.info("===== Building " + commitMessage + " on "+ qmGit.getBranchName() + " =====");
+                qmLog.info("=====\nBuilding\n" + commitMessage + "\non branch: "+ qmGit.getBranchName() + "\n=====");
             });
         });
     },

diff --git a/modules/qmGit.js b/modules/qmGit.js
@@ -63,7 +63,7 @@ var qmGit = {
     outputCommitMessageAndBranch: function () {
         qmGit.getCommitMessage(function (commitMessage) {
             qmGit.setBranchName(function (branchName) {
-                qmLog.info("===== Building " + commitMessage + " on "+ branchName + " =====");
+                qmLog.info("=====\nBuilding\n" + commitMessage + "\non branch: "+ branchName + "\n=====");
             })
         })
     },
@@ -134,4 +134,4 @@ var qmGit = {
         return options;
     }
 };
-if(typeof window !== "undefined"){ window.qmGit = qmGit;} else {module.exports = qmGit;}
+if(typeof window !== "undefined"){ window.qmGit = qmGit;} else {module.exports = qmGit;}
diff --git a/modules/qmLog.js b/modules/qmLog.js
@@ -190,7 +190,7 @@ var qmLog = {
         outputCommitMessageAndBranch: function () {
             qmLog.qmGit.getCommitMessage(function (commitMessage) {
                 qmLog.qmGit.setBranchName(function (branchName) {
-                    qmLog.info("===== Building " + commitMessage + " on "+ branchName + " =====");
+                    qmLog.info("=====\nBuilding\n" + commitMessage + "\non branch: "+ branchName + "\n=====");
                 })
             })
         },

diff --git a/package.json b/package.json
@@ -99,7 +99,7 @@
     "@types/mime": "2.0.3",
     "@types/mocha": "8.2.2",
     "@types/node": "10.17.56",
-    "@types/node-fetch": "^2.5.10",
+    "@types/node-fetch": "2.5.10",
     "@types/q": "1.5.4",
     "@types/remote-origin-url": "2.0.0",
     "@types/rimraf": "2.0.4",

diff --git a/scripts/ios_install_dependencies.sh b/scripts/ios_install_dependencies.sh
@@ -5,7 +5,12 @@ BRANCH_NAME=${BRANCH_NAME:-${TRAVIS_BRANCH}}
 BRANCH_NAME=${BRANCH_NAME:-${BUDDYBUILD_BRANCH}}
 BRANCH_NAME=${BRANCH_NAME:-${CIRCLE_BRANCH}}
 BRANCH_NAME=${BRANCH_NAME:-${GIT_BRANCH}}
-COMMIT_MESSAGE=$(git log -1 HEAD --pretty=format:%s) && echo "===== Building $COMMIT_MESSAGE on ${BRANCH_NAME} ====="
+COMMIT_MESSAGE=$(git log -1 HEAD --pretty=format:%s) && echo "
+=====
+Building
+$COMMIT_MESSAGE
+on branch: ${BRANCH_NAME}
+====="
 set -x
 
 bundle install
@@ -30,4 +35,4 @@ cordova plugin rm cordova-plugin-mauron85-background-geolocation --save
 cordova plugin rm phonegap-plugin-push --save # Need to update to Firebase
 
 cordova platform rm ios
-cordova platform add [email protected]
+cordova platform add [email protected]
diff --git a/src/js/qmHelpers.js b/src/js/qmHelpers.js
@@ -4432,7 +4432,7 @@ var qm = {
         outputCommitMessageAndBranch: function(){
             qm.gitHelper.getCommitMessage(function(commitMessage){
                 qm.gitHelper.setBranchName(function(branchName){
-                    qmLog.info("===== Building " + commitMessage + " on " + branchName + " =====");
+                    qmLog.info("===== \nBuilding \n" + commitMessage + "\non branch: " + branchName + "\n=====");
                 });
             });
         },