diff options
| -rwxr-xr-x | aux/workflow/dist.sh | 16 | ||||
| -rwxr-xr-x | sh/templates/aux/workflow/dist.sh | 16 |
2 files changed, 22 insertions, 10 deletions
diff --git a/aux/workflow/dist.sh b/aux/workflow/dist.sh index 45fc30a7..8f8f6170 100755 --- a/aux/workflow/dist.sh +++ b/aux/workflow/dist.sh @@ -2,16 +2,22 @@ set -eu DATE="$1" -VERSION="v$2" +VERSION="$2" +VVERSION="v$2" -if git show "$VERSION" 1>/dev/null 2>/dev/null; then - echo "Version '$VERSION' already exists." +if git show "$VVERSION" 1>/dev/null 2>/dev/null; then + echo "Version '$VVERSION' already exists." >&2 exit 1 fi if [ "$DATE" != "$(git log -1 --format=%cd --date=short HEAD)" ]; then - echo "Date '$DATE' is not up-to-date." + echo "Date '$DATE' is not up-to-date." >&2 exit 1 fi -git tag "$VERSION" +if ! grep -q "^# $VERSION - $DATE$" CHANGELOG.md; then + echo "Missing '# $VERSION - $DATE' entry from CHANGELOG.md" >&2 + exit 1 +fi + +git tag "$VVERSION" diff --git a/sh/templates/aux/workflow/dist.sh b/sh/templates/aux/workflow/dist.sh index 45fc30a7..8f8f6170 100755 --- a/sh/templates/aux/workflow/dist.sh +++ b/sh/templates/aux/workflow/dist.sh @@ -2,16 +2,22 @@ set -eu DATE="$1" -VERSION="v$2" +VERSION="$2" +VVERSION="v$2" -if git show "$VERSION" 1>/dev/null 2>/dev/null; then - echo "Version '$VERSION' already exists." +if git show "$VVERSION" 1>/dev/null 2>/dev/null; then + echo "Version '$VVERSION' already exists." >&2 exit 1 fi if [ "$DATE" != "$(git log -1 --format=%cd --date=short HEAD)" ]; then - echo "Date '$DATE' is not up-to-date." + echo "Date '$DATE' is not up-to-date." >&2 exit 1 fi -git tag "$VERSION" +if ! grep -q "^# $VERSION - $DATE$" CHANGELOG.md; then + echo "Missing '# $VERSION - $DATE' entry from CHANGELOG.md" >&2 + exit 1 +fi + +git tag "$VVERSION" |