From b1dfe9219fa4e827697c2390495ac912e3a96ac6 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sun, 16 Jan 2022 00:58:02 -0300 Subject: aux/workflow/dist.sh: Enforce $VERSION and $DATE from Makefil stay in sync --- CHANGELOG.md | 7 +++++++ aux/workflow/dist.sh | 12 ++++++++++++ po/LC_MESSAGES/CHANGELOG.en.md/eo.po | 10 ++++++++++ po/LC_MESSAGES/CHANGELOG.en.md/fr.po | 10 ++++++++++ po/LC_MESSAGES/CHANGELOG.en.md/pt.po | 9 +++++++++ 5 files changed, 48 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45060fc..4f6d1f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,13 @@ Changelog for [git-permalink](https://euandreh.xyz/git-permalink/en/). # Unreleased +## Fixed + +### Reported version + +The reported version of the program is now forced to be in sync with the +released version. + # [0.3.0](https://euandreh.xyz/git-permalink.git/commit/?id=v0.3.0) - 2022-01-16 ## Added diff --git a/aux/workflow/dist.sh b/aux/workflow/dist.sh index f950e7c..48a9d57 100755 --- a/aux/workflow/dist.sh +++ b/aux/workflow/dist.sh @@ -53,6 +53,12 @@ if git show "$VVERSION" 1>/dev/null 2>/dev/null; then exit 1 fi +if [ "v$(awk '/^VERSION *=/{print $3; exit}' Makefile)" != "$VVERSION" ]; then + echo "Version '$VVERSION' mismatch with \$(VERSION) in Makefile." >&2 + echo 'Make sure to invoke this script with "make dist".' >&2 + exit 1 +fi + if ! printf '%s\n%s\n' "$(git tag)" "$VVERSION" | sort -nct. -k1 -k2 -k3; then echo 'New tag is not bigger than existing ones.' >&2 exit 1 @@ -63,6 +69,12 @@ if [ "$DATE" != "$(git log -1 --format=%cd --date=short HEAD)" ]; then exit 1 fi +if [ "$(awk '/^DATE *=/{print $3; exit}' Makefile)" != "$DATE" ]; then + echo "Date '$DATE' mismatch with \$(DATE) in Makefile." >&2 + echo 'Make sure to invoke this script with "make dist".' >&2 + exit 1 +fi + if [ "Release $VVERSION" != "$(git log --format=%B -1 HEAD | head -n1)" ]; then echo "Commit message isn't 'Release $VVERSION'." >&2 exit 1 diff --git a/po/LC_MESSAGES/CHANGELOG.en.md/eo.po b/po/LC_MESSAGES/CHANGELOG.en.md/eo.po index b2af0d1..9c97f1b 100644 --- a/po/LC_MESSAGES/CHANGELOG.en.md/eo.po +++ b/po/LC_MESSAGES/CHANGELOG.en.md/eo.po @@ -268,6 +268,16 @@ msgstr "" "[0.3.0](https://euandreh.xyz/git-permalink.git/commit/?id=v0.3.0) - " "2022-01-16" +msgid "Reported version" +msgstr "Raportita versio" + +msgid "" +"The reported version of the program is now forced to be in sync with the " +"released version." +msgstr "" +"La raportita versio de la programo nun estas devigita sinkronigi kun la " +"publikigita versio." + #~ msgid "" #~ "All code forges listed in [`#task-" #~ "cebc5298-17ad-5c60-dfa5-a25b66433a3a`](https://euandreh.xyz/git-" diff --git a/po/LC_MESSAGES/CHANGELOG.en.md/fr.po b/po/LC_MESSAGES/CHANGELOG.en.md/fr.po index 8749bf5..d75ac6d 100644 --- a/po/LC_MESSAGES/CHANGELOG.en.md/fr.po +++ b/po/LC_MESSAGES/CHANGELOG.en.md/fr.po @@ -272,6 +272,16 @@ msgstr "" "[0.3.0](https://euandreh.xyz/git-permalink.git/commit/?id=v0.3.0) - " "2022-01-16" +msgid "Reported version" +msgstr "Version reportée" + +msgid "" +"The reported version of the program is now forced to be in sync with the " +"released version." +msgstr "" +"La version montrée par le logiciel est maintenant la même que la version " +"publiée." + #~ msgid "" #~ "All code forges listed in [`#task-" #~ "cebc5298-17ad-5c60-dfa5-a25b66433a3a`](https://euandreh.xyz/git-" diff --git a/po/LC_MESSAGES/CHANGELOG.en.md/pt.po b/po/LC_MESSAGES/CHANGELOG.en.md/pt.po index 80fadd1..28f113c 100644 --- a/po/LC_MESSAGES/CHANGELOG.en.md/pt.po +++ b/po/LC_MESSAGES/CHANGELOG.en.md/pt.po @@ -270,6 +270,15 @@ msgstr "" "[0.3.0](https://euandreh.xyz/git-permalink.git/commit/?id=v0.3.0) - " "2022-01-16" +msgid "Reported version" +msgstr "Versão relatada" + +msgid "" +"The reported version of the program is now forced to be in sync with the " +"released version." +msgstr "" +"A versão relatada do programa agora está de acordo com a versão lançada." + #~ msgid "" #~ "`$(LIBEXECDIR)` pointing to `$(PREFIX)/libexec` where `src/load-locale-" #~ "messages.sh.in` is put;" -- cgit v1.2.3