diff --git a/.github/actions/tag-jira-release/jira_tag_tickets.sh b/.github/actions/tag-jira-release/jira_tag_tickets.sh index 224104a..92df5c3 100755 --- a/.github/actions/tag-jira-release/jira_tag_tickets.sh +++ b/.github/actions/tag-jira-release/jira_tag_tickets.sh @@ -107,7 +107,7 @@ function get_tickets_in_current_branch() { echo "Checking for tickets between $(get_current_branch) and $target_branch" >&2 local ticket_info="$($TICKET_STATUS_PATH $(get_current_branch) $target_branch)" echo "$ticket_info" >&2 - echo "$ticket_info" | grep -v '"Done"' | grep -v "Cancelled" | jq -r .url | sort | uniq | sed 's/https:\/\/'$JIRA_DOMAIN'\/browse\///g' + echo "$ticket_info" | grep -v '"Done"' | grep -v "Cancelled" | grep -v '"skip-release-notes"' | jq -r .url | sort | uniq | sed 's/https:\/\/'$JIRA_DOMAIN'\/browse\///g' } function existing_version() { diff --git a/.github/actions/tag-jira-release/ticket_status.sh b/.github/actions/tag-jira-release/ticket_status.sh index 5f321ce..1cdb8d3 100755 --- a/.github/actions/tag-jira-release/ticket_status.sh +++ b/.github/actions/tag-jira-release/ticket_status.sh @@ -48,6 +48,14 @@ function getTicketInfo() { fi } +function hasSkipReleaseNotes() { + commitHash=$1 + LOG=$(git show $commitHash | sed '/^diff/,$d') + if [[ "$LOG" =~ \[skip-release-notes\] ]]; then + echo -n ",\"skip-release-notes\":true" + fi +} + while IFS= read -r hash; do FILE=~/temp/$hash.txt if [ -f "$FILE" ]; then @@ -55,6 +63,7 @@ while IFS= read -r hash; do if [ "$ticketId" != "" ]; then echo -n "{\"hash\":\"$hash\"," getTicketInfo $ticketId + hasSkipReleaseNotes $hash echo "}" fi done <<< "$(cat $FILE | sed 's/ /\n/g')" diff --git a/package.json b/package.json index 2994d87..692c93a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "github-actions", - "version": "2.17.0", + "version": "2.18.0", "description": "Used to store GitHub actions for use across the enterprise", "scripts": { "test": "./tooling/scripts/run_tests.sh",