From 2d933785d6886eaa199ce1212de2455a39c7285c Mon Sep 17 00:00:00 2001 From: Jonatan Castro Date: Thu, 26 Nov 2020 17:56:09 +1100 Subject: [PATCH] Simplify slack message --- .circleci/config.yml | 8 +++----- .circleci/slack-message.sh | 8 +------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index adf3e23..d767bbf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,11 +15,11 @@ jobs: OUTPUT=$(./ssl_checker.py -f ./hosts_to_check) echo "$OUTPUT" if ! [[ echo "$OUTPUT" | grep "Expired: 0" ]]; then - .circleci/slack-message.sh "*Checked SSL Certificates*: Expired :x:" "MASTER" $DATE "#FF0000" + .circleci/slack-message.sh "*Checked SSL Certificates*: Expired :x:" "#FF0000" elif ! [[ echo "$OUTPUT" | grep "Warning: 0" ]]; then - .circleci/slack-message.sh "*Checked SSL Certificates*: Warnings :warning:" "MASTER" $DATE "#FF0000" + .circleci/slack-message.sh "*Checked SSL Certificates*: Warnings :warning:" "#FF0000" else - .circleci/slack-message.sh "*Checked SSL Certificates*: Success :key:" "MASTER" $DATE "#008000" + .circleci/slack-message.sh "*Checked SSL Certificates*: Success :key:" "#008000" fi workflows: @@ -27,7 +27,6 @@ workflows: sslcheck-on-push: jobs: - sslcheck: - #TODO: Change context context: github-backup filters: branches: @@ -42,7 +41,6 @@ workflows: - master jobs: - sslcheck: - #TODO: Change context context: github-backup filters: branches: diff --git a/.circleci/slack-message.sh b/.circleci/slack-message.sh index 5c26d6a..18d0bad 100755 --- a/.circleci/slack-message.sh +++ b/.circleci/slack-message.sh @@ -1,8 +1,6 @@ #!/bin/sh DEFAULT_TEXT=$1 -DEPLOY_ENV=${2:-DEV} -VERSION_NUMBER=$3 -COLOR=$4 +COLOR=$2 COMMIT_MSG="$(git rev-list --format=%B --max-count=1 $CIRCLE_SHA1)" TS=$(date +"%s") @@ -10,10 +8,6 @@ TS=$(date +"%s") SLACK_MESSAGE='{ "text": "'$DEFAULT_TEXT'", "attachments": [ - { - "text":"*Version:* '$VERSION_NUMBER'\n*Environment:* '$DEPLOY_ENV'", - "color":"'$COLOR'" - }, { "title": "Commits", "color":"'$COLOR'",