diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | aux/workflow/dist.sh | 5 |
2 files changed, 4 insertions, 5 deletions
@@ -51,8 +51,8 @@ clean: dev-check: check public sh aux/assert-shellcheck.sh sh aux/workflow/assert-todos.sh - sh aux/workflow/assert-changelog.sh -n '$(NAME)' - sh aux/workflow/assert-readme.sh -n '$(NAME)' -m '$(MAILING_LIST)' + sh aux/workflow/assert-changelog.sh -n '$(NAME)' $(EXTRA_VERSION) + sh aux/workflow/assert-readme.sh -n '$(NAME)' -m '$(MAILING_LIST)' $(EXTRA_VERSION) sh aux/workflow/assert-manpages.sh -n '$(NAME)' -m '$(MAILING_LIST)' \ -l '$(TRANSLATIONS) en' $(manpages.en.in) sh aux/workflow/repocheck.sh -x1 -l1 -f5 diff --git a/aux/workflow/dist.sh b/aux/workflow/dist.sh index cab9ff3..1156474 100755 --- a/aux/workflow/dist.sh +++ b/aux/workflow/dist.sh @@ -59,9 +59,6 @@ if [ "$TAG_LIST" != "$(echo "$TAG_LIST" | sort -t. -n -k1 -k2 -k3)" ]; then exit 1 fi -sh aux/workflow/assert-changelog.sh -N "$PROJECT_UC" -n "$PROJECT" "$VVERSION" -sh aux/workflow/assert-readme.sh -n "$PROJECT" -m "$MAILING_LIST" "$VVERSION" - if [ "$DATE" != "$(git log -1 --format=%cd --date=short HEAD)" ]; then echo "Date '$DATE' is not up-to-date." >&2 exit 1 @@ -72,6 +69,8 @@ if [ "Release $VVERSION" != "$(git log --format=%B -1 HEAD | head -n1)" ]; then exit 1 fi +make clean public dev-check EXTRA_VERSION="$VVERSION" + if ! (git diff --quiet && git diff --quiet --staged); then echo 'Dirty repository.' exit 1 |