From 6ae5cd35ada4cf220169614ae0e75ef47c7b5638 Mon Sep 17 00:00:00 2001 From: "Raphael \"Thom\" Thomazella" Date: Wed, 4 Sep 2024 16:56:01 -0300 Subject: [PATCH 1/6] fix(workflows/release): correct unset env DRY_RUN --- .github/workflows/release.yml | 1 + workflows/release/tag.sh | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2db6e72..8794543 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,4 +22,5 @@ jobs: env: CHANGELOG_FILE: CHANGELOG.md BASH_ENV: ./lib.sh + DRY_RUN: false run: ./workflows/release/tag.sh diff --git a/workflows/release/tag.sh b/workflows/release/tag.sh index 6565255..ad058e3 100755 --- a/workflows/release/tag.sh +++ b/workflows/release/tag.sh @@ -101,13 +101,19 @@ validate_tags() { } # Description: Creates and pushes git tags -# Globals : DRY_RUN (set to echo to dry run) +# Globals : DRY_RUN bool # Args : words separated by spaces # STDOUT : Prints each tag created, plus git output # STDERR : Git might output # Sideeffects: Pushes git tags # Example : tag_and_push foo/v1.1.1. bar/v1.2.3 tag_and_push() { + if [ "${DRY_RUN:-}" == "true" ]; then + DRY_RUN="echo" + else + DRY_RUN="" + fi + for tag in "$@"; do msgln "$tag" $DRY_RUN git tag "$tag" HEAD From 9f1a2b996866f3bd9a904907bac4d24151594012 Mon Sep 17 00:00:00 2001 From: "Raphael \"Thom\" Thomazella" Date: Thu, 5 Sep 2024 01:06:08 -0300 Subject: [PATCH 2/6] feat(workflows/release): add TAGS_FILE global --- workflows/release/changelog.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/workflows/release/changelog.sh b/workflows/release/changelog.sh index fda7372..bf9a205 100755 --- a/workflows/release/changelog.sh +++ b/workflows/release/changelog.sh @@ -34,7 +34,7 @@ validate() { } # Description: Calls changelog tool and updates CHANGELOG_FILE -# Globals : CHANGELOG_FILE (github workflow or .env) +# Globals : CHANGELOG_FILE, TAGS_FILE (github workflow or .env) # Args : 1=url 2=title 3=prefix # STDERR : Might print errors # Returns : 1 if fail @@ -47,6 +47,7 @@ update_changelog() { flags+=(-title "$title") flags+=(-tagprefix "$prefix") flags+=(-url "$url") + flags+=(-tagsfile "${TAGS_FILE:-}") changes=$(changelog "${flags[@]}") if [ ! "$changes" ]; then From 6c9620c5544c88c2ed9a698df6a179aeced8b432 Mon Sep 17 00:00:00 2001 From: "Raphael \"Thom\" Thomazella" Date: Thu, 5 Sep 2024 01:07:57 -0300 Subject: [PATCH 3/6] fix(workflows/release): correct chagelog flag name --- workflows/release/changelog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows/release/changelog.sh b/workflows/release/changelog.sh index bf9a205..c06ceea 100755 --- a/workflows/release/changelog.sh +++ b/workflows/release/changelog.sh @@ -45,7 +45,7 @@ update_changelog() { changelog=$(cat "$CHANGELOG_FILE") flags+=(-title "$title") - flags+=(-tagprefix "$prefix") + flags+=(-tagprefixes "$prefix") flags+=(-url "$url") flags+=(-tagsfile "${TAGS_FILE:-}") From 8e9338cfbfddbb34188c1168d98a8114a5feb32c Mon Sep 17 00:00:00 2001 From: "Raphael \"Thom\" Thomazella" Date: Thu, 5 Sep 2024 01:16:02 -0300 Subject: [PATCH 4/6] misc: add tags.txt --- tags.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 tags.txt diff --git a/tags.txt b/tags.txt new file mode 100644 index 0000000..7933af7 --- /dev/null +++ b/tags.txt @@ -0,0 +1,2 @@ +# this file is generated to aid in automating releases +v0.2.1 From cea0f9cdb492fbdacdf7ff52ff79f42033e8c3a8 Mon Sep 17 00:00:00 2001 From: "Raphael \"Thom\" Thomazella" Date: Thu, 5 Sep 2024 01:32:23 -0300 Subject: [PATCH 5/6] misc: newlines, rename var --- workflows/release/changelog.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/workflows/release/changelog.sh b/workflows/release/changelog.sh index c06ceea..f6d1085 100755 --- a/workflows/release/changelog.sh +++ b/workflows/release/changelog.sh @@ -35,17 +35,17 @@ validate() { # Description: Calls changelog tool and updates CHANGELOG_FILE # Globals : CHANGELOG_FILE, TAGS_FILE (github workflow or .env) -# Args : 1=url 2=title 3=prefix +# Args : 1=url 2=title 3=prefixes # STDERR : Might print errors # Returns : 1 if fail # Sideeffects: Updates CHANGELOG_FILE # Example : update_changelog pizza update_changelog() { - local url=$1 title=${2:-} prefix=${3:-} changes changelog flags=() + local url=$1 title=${2:-} prefixes=${3:-} changes changelog flags=() changelog=$(cat "$CHANGELOG_FILE") flags+=(-title "$title") - flags+=(-tagprefixes "$prefix") + flags+=(-tagprefixes "$prefixes") flags+=(-url "$url") flags+=(-tagsfile "${TAGS_FILE:-}") @@ -56,6 +56,7 @@ update_changelog() { fi printf %s "$changes" >"$CHANGELOG_FILE" + printf %s "\n\n" >>"$CHANGELOG_FILE" printf %s "$changelog" >>"$CHANGELOG_FILE" } From 8167d27227e8e382ea50fabebc50aa566790d259 Mon Sep 17 00:00:00 2001 From: "Raphael \"Thom\" Thomazella" Date: Thu, 5 Sep 2024 01:36:32 -0300 Subject: [PATCH 6/6] misc: newlines --- workflows/release/changelog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows/release/changelog.sh b/workflows/release/changelog.sh index f6d1085..105bb1d 100755 --- a/workflows/release/changelog.sh +++ b/workflows/release/changelog.sh @@ -56,7 +56,7 @@ update_changelog() { fi printf %s "$changes" >"$CHANGELOG_FILE" - printf %s "\n\n" >>"$CHANGELOG_FILE" + printf "\n\n" >>"$CHANGELOG_FILE" printf %s "$changelog" >>"$CHANGELOG_FILE" }