Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
- name: Generate changelog
run: |
changelog=""

# Get tags newest to oldest
tags=($(git tag --sort=-version:refname))

Expand All @@ -117,8 +117,10 @@ jobs:
else
untagged_commits=$(git --no-pager log --format="%s (%an) [%h]")
fi

future_tag="$( awk -F'"' '/"version": ".+"/{ print $4; exit; }' package.json )"

# Get future version from package.json
future_tag="$(awk -F'"' '/"version": ".+"/{ print $4; exit; }' package.json)"

if [ -n "$untagged_commits" ]; then
tag_log="### ${future_tag}\n"
while IFS= read -r commit; do
Expand All @@ -127,16 +129,20 @@ jobs:
changelog="${tag_log}\n${changelog}"
fi

# Loop over all tags, newest to oldest
# Loop from i=0 to i <= tags.length (YES, intentionally +1)
for ((i=0; i<=${#tags[@]}; i++)); do
current="${tags[$i]}"
next=""
next="${tags[$((i+1))]}"

# Skip if current is empty (e.g., i == len)
if [ -z "$current" ]; then
continue
fi

if (( i <= ${#tags[@]} - 1 )); then
next="${tags[$((i+1))]}"
if [ -n "$next" ]; then
commits=$(git --no-pager log --format="%s (%an) [%h]" "${next}..${current}")
else
echo "TAG (current) = (${current})"
# last tag (oldest), no previous one
commits=$(git --no-pager log --format="%s (%an) [%h]" "${current}")
fi

Expand All @@ -150,7 +156,6 @@ jobs:
done

changelog="# Changelog\n${changelog}"

echo -e "$changelog"
printf '%b' "$changelog" > CHANGELOG.md
- name: Upload new changelog
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "async-wait-until",
"version": "2.0.26",
"version": "2.0.27",
"description": "Waits until the given predicate function returns a truthy value, then resolves",
"main": "./dist/index.js",
"module": "./dist/index.esm.js",
Expand Down