Skip to content

Commit 5211242

Browse files
Merge pull request #100 from VirdocsSoftware/release/v2.18.0
release v2.18.0 to main
2 parents 1cbc223 + dd05e73 commit 5211242

3 files changed

Lines changed: 11 additions & 2 deletions

File tree

.github/actions/tag-jira-release/jira_tag_tickets.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function get_tickets_in_current_branch() {
107107
echo "Checking for tickets between $(get_current_branch) and $target_branch" >&2
108108
local ticket_info="$($TICKET_STATUS_PATH $(get_current_branch) $target_branch)"
109109
echo "$ticket_info" >&2
110-
echo "$ticket_info" | grep -v '"Done"' | grep -v "Cancelled" | jq -r .url | sort | uniq | sed 's/https:\/\/'$JIRA_DOMAIN'\/browse\///g'
110+
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'
111111
}
112112

113113
function existing_version() {

.github/actions/tag-jira-release/ticket_status.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,22 @@ function getTicketInfo() {
4848
fi
4949
}
5050

51+
function hasSkipReleaseNotes() {
52+
commitHash=$1
53+
LOG=$(git show $commitHash | sed '/^diff/,$d')
54+
if [[ "$LOG" =~ \[skip-release-notes\] ]]; then
55+
echo -n ",\"skip-release-notes\":true"
56+
fi
57+
}
58+
5159
while IFS= read -r hash; do
5260
FILE=~/temp/$hash.txt
5361
if [ -f "$FILE" ]; then
5462
while IFS= read -r ticketId; do
5563
if [ "$ticketId" != "" ]; then
5664
echo -n "{\"hash\":\"$hash\","
5765
getTicketInfo $ticketId
66+
hasSkipReleaseNotes $hash
5867
echo "}"
5968
fi
6069
done <<< "$(cat $FILE | sed 's/ /\n/g')"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "github-actions",
3-
"version": "2.17.0",
3+
"version": "2.18.0",
44
"description": "Used to store GitHub actions for use across the enterprise",
55
"scripts": {
66
"test": "./tooling/scripts/run_tests.sh",

0 commit comments

Comments
 (0)