From 411cb8fc78636c11571f28b0399377b5be458b5f Mon Sep 17 00:00:00 2001 From: Mechiel Lukkien Date: Mon, 11 Mar 2024 15:27:25 +0100 Subject: [PATCH] for apidiff, generate apidiff/next.txt and rotate it on release instead of already giving it a version name before the release. the released version could be different. --- Makefile | 2 +- apidiff.sh | 9 ++++----- apidiff/next.txt | 38 ++++++++++++++++++++++++++++++++++++++ develop.txt | 2 ++ 4 files changed, 45 insertions(+), 6 deletions(-) create mode 100644 apidiff/next.txt diff --git a/Makefile b/Makefile index 6c6294e..18a8d55 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,7 @@ webaccount/account.js: lib.ts webaccount/api.ts webaccount/account.ts frontend: webadmin/admin.js webaccount/account.js webmail/webmail.js webmail/msg.js webmail/text.js genapidiff: - # needs file next.txt containing next version number, and golang.org/x/exp/cmd/apidiff@v0.0.0-20231206192017-f3f8817b8deb installed + # needs golang.org/x/exp/cmd/apidiff@v0.0.0-20231206192017-f3f8817b8deb installed ./apidiff.sh docker: diff --git a/apidiff.sh b/apidiff.sh index 7cb9f0d..0ffa27b 100755 --- a/apidiff.sh +++ b/apidiff.sh @@ -2,18 +2,17 @@ set -e prevversion=$(go list -mod=readonly -m -f '{{ .Version }}' github.com/mjl-/mox@latest) -nextversion=$(cat next.txt) if ! test -d tmp/mox-$prevversion; then mkdir -p tmp/mox-$prevversion git archive --format=tar $prevversion | tar -C tmp/mox-$prevversion -xf - fi (rm -r tmp/apidiff || exit 0) mkdir -p tmp/apidiff/$prevversion tmp/apidiff/next -(rm apidiff/$nextversion.txt || exit 0) +(rm apidiff/next.txt || exit 0) ( -echo "Below are the incompatible changes between $prevversion and $nextversion, per package." +echo "Below are the incompatible changes between $prevversion and next, per package." echo -) >>apidiff/$nextversion.txt +) >>apidiff/next.txt for p in $(cat apidiff/packages.txt); do (cd tmp/mox-$prevversion && apidiff -w ../apidiff/$prevversion/$p.api ./$p) apidiff -w tmp/apidiff/next/$p.api ./$p @@ -21,5 +20,5 @@ for p in $(cat apidiff/packages.txt); do echo '#' $p apidiff -incompatible tmp/apidiff/$prevversion/$p.api tmp/apidiff/next/$p.api echo - ) >>apidiff/$nextversion.txt + ) >>apidiff/next.txt done diff --git a/apidiff/next.txt b/apidiff/next.txt new file mode 100644 index 0000000..aeeb52b --- /dev/null +++ b/apidiff/next.txt @@ -0,0 +1,38 @@ +Below are the incompatible changes between v0.0.10 and next, per package. + +# dane + +# dmarc + +# dmarcrpt + +# dns + +# dnsbl + +# iprev + +# message + +# mtasts + +# publicsuffix + +# ratelimit + +# sasl + +# scram + +# smtp + +# smtpclient + +# spf + +# subjectpass + +# tlsrpt + +# updates + diff --git a/develop.txt b/develop.txt index f1ceb6e..b680503 100644 --- a/develop.txt +++ b/develop.txt @@ -288,6 +288,7 @@ done - Send and receive email with imap4/smtp clients. - Check DNS check admin page. - Check with https://internet.nl. +- Move apidiff/next.txt to apidiff/.txt, and create empty next.txt. - Add release to the Latest release & News sections of website/index.md. - Create git tag, push code. - Publish new docker image. @@ -298,3 +299,4 @@ done instructions to prevent confusion about "assets" github links to. - Publish new cross-referenced code/rfc to www.xmox.nl/xr/. - Update moxtools with latest version. +- Update implementations support matrix.