diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | aux/ci/ci-build.sh | 2 | ||||
| -rwxr-xr-x | aux/workflow/README.sh | 4 | ||||
| -rwxr-xr-x | aux/workflow/assert-changelog.sh | 14 | ||||
| -rwxr-xr-x | aux/workflow/dist.sh | 8 | ||||
| -rwxr-xr-x | aux/workflow/sign-tarballs.sh | 17 |
6 files changed, 40 insertions, 7 deletions
@@ -8,6 +8,8 @@ check: clean: rm -rf public/ +dev-check: check + public: sh aux/workflow/public.sh Servers servers public-inbox diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index fb49e71..1c033fe 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -50,7 +50,7 @@ EOF RUNNER='sh -c' fi - $RUNNER 'make clean check public' + $RUNNER 'make clean dev-check public' rsync -avzzP public/ "/srv/http/$PACKAGE/" --delete } 2>&1 | tee "$LOGFILE" diff --git a/aux/workflow/README.sh b/aux/workflow/README.sh index 8313274..e30344f 100755 --- a/aux/workflow/README.sh +++ b/aux/workflow/README.sh @@ -8,8 +8,8 @@ PROJECT="$2" MAILING_LIST="$3" RELEASES_LIST="$(mktemp)" -for version in $(git tag); do - echo "- version [$version](https://git.euandreh.xyz/$PROJECT/snapshot/$PROJECT-$version.tar.gz), released in $(git log -1 --format=%cd --date=short "$version")" >> "$RELEASES_LIST" +for version in $(git tag | perl -e 'print reverse <>'); do + echo "- version [$version](https://git.euandreh.xyz/$PROJECT/snapshot/$PROJECT-$version.tar.gz) ([sig](https://git.euandreh.xyz/$PROJECT/snapshot/$PROJECT-$version.tar.gz.asc)), released in $(git log -1 --format=%cd --date=short "$version")" >> "$RELEASES_LIST" done RELEASES="$(mktemp)" diff --git a/aux/workflow/assert-changelog.sh b/aux/workflow/assert-changelog.sh new file mode 100755 index 0000000..d39f527 --- /dev/null +++ b/aux/workflow/assert-changelog.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -eu + +PROJECT="$1" + +for VVERSION in $(git tag); do + VERSION="${VVERSION#v}" + DATE="$(git log -1 --format=%cd --date=short "$VVERSION")" + CHANGELOG_ENTRY="# [$VERSION](https://git.euandreh.xyz/$PROJECT/commit/?id=$VVERSION) - $DATE" + if ! grep -qF "$CHANGELOG_ENTRY" CHANGELOG.md; then + echo "Missing '$CHANGELOG_ENTRY' entry from CHANGELOG.md" >&2 + exit 1 + fi +done diff --git a/aux/workflow/dist.sh b/aux/workflow/dist.sh index 8f8f617..afe2c92 100755 --- a/aux/workflow/dist.sh +++ b/aux/workflow/dist.sh @@ -4,6 +4,7 @@ set -eu DATE="$1" VERSION="$2" VVERSION="v$2" +PROJECT="$3" if git show "$VVERSION" 1>/dev/null 2>/dev/null; then echo "Version '$VVERSION' already exists." >&2 @@ -15,9 +16,8 @@ if [ "$DATE" != "$(git log -1 --format=%cd --date=short HEAD)" ]; then exit 1 fi -if ! grep -q "^# $VERSION - $DATE$" CHANGELOG.md; then - echo "Missing '# $VERSION - $DATE' entry from CHANGELOG.md" >&2 - exit 1 -fi +sh aux/workflow/assert-changelog.sh "$DATE" "$VERSION" "$PROJECT" git tag "$VVERSION" + +sh aux/workflow/sign-tarballs.sh "$PROJECT" diff --git a/aux/workflow/sign-tarballs.sh b/aux/workflow/sign-tarballs.sh new file mode 100755 index 0000000..b88ff33 --- /dev/null +++ b/aux/workflow/sign-tarballs.sh @@ -0,0 +1,17 @@ +#!/bin/sh +set -eu + +PROJECT="$1" + +SIGNATURES="$(git notes --ref=refs/notes/signatures/tar.gz list | cut -d\ -f2)" +for tag in $(git tag); do + COMMIT="$(git rev-list -n1 "$tag")" + if ! echo "$SIGNATURES" | grep -qF "$COMMIT"; then + echo "Adding missing signature to $tag" >&2 + git notes --ref=refs/notes/signatures/tar.gz add -f -C "$( + git archive --format tar.gz --prefix "$PROJECT-${tag#v}/" "$tag" | + gpg --output - --armor --detach-sign | + git hash-object -w --stdin + )" "$tag" + fi +done |