[ci] Fixed Slack messages

applejag · applejag · commit 6e6a3e31c68b · 2019-04-01T10:08:28.000+02:00
diff --git a/scripts/commit_upm.sh b/scripts/commit_upm.sh
@@ -40,8 +40,6 @@ if [ $COMMIT_STATUS -eq 1 ]
 then
     # Nothing to commit.
     echo "<<< Nothing to commit."
-    echo "Exiting... Nothing new anyways."
-    exit 0
 elif [ $COMMIT_STATUS -ne 0 ]
 then
     echo "<<< Unexpected error during commit. Aborting."
diff --git a/scripts/slack_notify_github_deploy.sh b/scripts/slack_notify_github_deploy.sh
@@ -80,10 +80,13 @@ function getAuthorFields {
 }
 
 author=""
-text="*Project: `$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME` Branch: `$CIRCLE_BRANCH`*"
+text="*Project: \`$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME\` Branch: \`$CIRCLE_BRANCH\`*"
 fields=""
 actions=""
 
+echo "BUILD_STATUS='$BUILD_STATUS'"
+echo "DEPLOY_STATUS='$DEPLOY_STATUS'"
+
 if [[ "$BUILD_STATUS" == "success" ]]
 then
     if [[ "$DEPLOY_STATUS" == "success" ]]
@@ -101,34 +104,36 @@ then
             }
         "
         if [[ "$DEPLOY_TAG_MELLIS" ]]; then
-            mellisTagText="(tag: <https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/releases/tag/$DEPLOY_TAG_MELLIS|$DEPLOY_TAG_MELLIS>)"
+            mellisTagText="_(tag: <https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/releases/tag/$DEPLOY_TAG_MELLIS|$DEPLOY_TAG_MELLIS>)_"
         else
-            mellisTagText="(no new tag)"
+            mellisTagText="_(no new tag)_"
         fi
         if [[ "$DEPLOY_TAG_PYTHON3" ]]; then
-            python3TagText="(tag: <https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/releases/tag/$DEPLOY_TAG_PYTHON3|$DEPLOY_TAG_PYTHON3>)"
+            python3TagText="_(tag: <https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/releases/tag/$DEPLOY_TAG_PYTHON3|$DEPLOY_TAG_PYTHON3>)_"
         else
-            python3TagText="(no new tag)"
+            python3TagText="_(no new tag)_"
         fi
         fields="{
                 \"title\": \"Mellis\",
-                \"value\": \"```$MELLIS_VERSION```\\n$mellisTagText\",
+                \"value\": \"\`\`\`$MELLIS_VERSION\`\`\`\\n$mellisTagText\",
                 \"short\": true
             },
             {
                 \"title\": \"Python3 module\",
-                \"value\": \"```$MELLIS_PYTHON3_VERSION```\\n$python3TagText\",
+                \"value\": \"\`\`\`$MELLIS_PYTHON3_VERSION\`\`\`\\n$python3TagText\",
                 \"short\": true
             }"
-    elif [[ "$DEPLOY_STATUS" == "idle" ]]
-    then
+    else
+        echo "Nothing to deploy 'eh?"
         # Nothing to deploy
-        color="#3AA3E3" # blue
+        #color="#3AA3E3" # blue
+        color="" # slack defaults to gray
         visitJobActionStyle="default" # gray
         title="NOTHING TO DEPLOY"
         text="$text\\n_No new tags_"
     fi
 else
+    # Build failed
     color="#ed5c5c" # red
     visitJobActionStyle="danger" # red
     title=":no_entry_sign: DEPLOYMENT JOB FAILED"
@@ -168,7 +173,8 @@ then
     echo "Job completed successfully. Alert sent."
 else
     echo "Something went wrong in the webhook..."
-    echo "Payload:"
-    echo
-    echo "$data"
 fi
+
+echo "Payload:"
+echo
+echo "$data"
diff --git a/scripts/slack_notify_testrunner.sh b/scripts/slack_notify_testrunner.sh
@@ -176,7 +176,7 @@ else
     text="$commitCount commits _(oldest first):_\\n$text"
 fi
 
-text="*`Project: $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME, Branch: $CIRCLE_BRANCH`*\\n$text"
+text="*Project: \`$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME\` Branch: \`$CIRCLE_BRANCH\`*\\n$text"
 
 footer="$(git diff --shortstat $commitRange)"
 testPercent=$((100*TEST_PASSED/TEST_TOTAL))
