Skip to content

Commit

Permalink
Merge pull request #1 from mattrabe/fix-commit-message
Browse files Browse the repository at this point in the history
Fix commit message -> main-fpcs
  • Loading branch information
mattrabe authored Nov 6, 2023
2 parents 22d1f61 + d2a5ad8 commit 36c6e8a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .circleci/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ executors:
jobs:
test:
executor: << parameters.executor >>
environment:
JIRA_DEBUG_TEST_COMMIT: "HEAD"
parameters:
executor:
type: executor
Expand Down
9 changes: 4 additions & 5 deletions src/scripts/notify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ remove_duplicates() {
declare -A seen
# Declare UNIQUE_KEYS as a global variable
UNIQUE_KEYS=()

for value in "$@"; do
# Splitting value into array by space, considering space-separated keys in a single string
for single_value in $value; do
Expand Down Expand Up @@ -121,7 +121,7 @@ getIssueKeys() {
JIRA_ISSUE_KEYS=$(printf '%s\n' "${KEY_ARRAY[@]}" | jq -R . | jq -s .)
echo "Issue keys found:"
echo "$JIRA_ISSUE_KEYS" | jq -r '.[]'

# Export JIRA_ISSUE_KEYS for use in other scripts or sessions
export JIRA_ISSUE_KEYS
}
Expand Down Expand Up @@ -238,9 +238,8 @@ JIRA_VAL_JIRA_WEBHOOK_URL="${JIRA_VAL_JIRA_WEBHOOK_URL}?verbosity=${JIRA_LOG_LEV
# JIRA_VAL_PIPELINE_NUMBER - pipeline number
TIME_EPOCH=$(date +%s)
TIME_STAMP=$(date -u +"%Y-%m-%dT%H:%M:%S.000Z")
# JIRA_DEBUG_TEST_COMMIT is only used in testing
COMMIT_MESSAGE=$(git show -s --format='%s' "${JIRA_DEBUG_TEST_COMMIT:-$CIRCLE_SHA1}")
COMMIT_BODY=$(git show -s --format='%b' "${JIRA_DEBUG_TEST_COMMIT:-$CIRCLE_SHA1}")
COMMIT_MESSAGE=$(git show -s --format='%s' "${CIRCLE_SHA1}^..${CIRCLE_SHA1}")
COMMIT_BODY=$(git show -s --format='%b' "${CIRCLE_SHA1}^..${CIRCLE_SHA1}")
JIRA_BUILD_STATUS=$(cat /tmp/circleci_jira_status)
PROJECT_VCS=""
PROJECT_SLUG=""
Expand Down

0 comments on commit 36c6e8a

Please sign in to comment.