summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2016-06-06 23:50:01 +0200
committeranonym <anonym@riseup.net>2016-06-06 23:50:34 +0200
commitb980f846939e1856d7d5682c93bf662e78c998c9 (patch)
tree157063607e7cccfdb6b843582a325c3de46bb42a
parent63aaa8e85a7e5f0123658f0093425d0912e0b74e (diff)
Improve release automation.
This way we only check the correctness of *new* UDF:s, and not old one that might be correct, but have signatures made with an expired key which otherwise report useless errors.
-rw-r--r--wiki/src/contribute/release_process.mdwn10
1 files changed, 4 insertions, 6 deletions
diff --git a/wiki/src/contribute/release_process.mdwn b/wiki/src/contribute/release_process.mdwn
index 8b2a085..6e2d9ec 100644
--- a/wiki/src/contribute/release_process.mdwn
+++ b/wiki/src/contribute/release_process.mdwn
@@ -653,6 +653,10 @@ Prepare upgrade-description files
-type f -name upgrades.yml | \
while read udf; do
if [ -n "$(git status --porcelain "${udf}")" ]; then
+ ( \
+ cd $IUK_CHECKOUT && \
+ ./bin/tails-iuk-check-upgrade-description-file "${udf}" \
+ ) || break
gpg -u "${TAILS_SIGNATURE_KEY}" --armor --detach-sign "${udf}"
mv "${udf}.asc" "${udf}.pgp"
fi
@@ -665,12 +669,6 @@ Prepare upgrade-description files
( cd "$RELEASE_CHECKOUT" && git add wiki/src/upgrade && \
git commit -m "Update upgrade-description files." )
-1. Check the syntactic correctness of all upgrade-description files:
-
- ( cd $IUK_CHECKOUT && \
- ./bin/tails-iuk-check-upgrade-description-file \
- ${RELEASE_CHECKOUT}/wiki/src/upgrade/v1/*/*/*/*/upgrades.yml )
-
1. If preparing a release candidate, move the generated or updated
files to `$MASTER_CHECKOUT`, commit and push: given the updates are
advertised on the *alpha* channel, while all users use the *stable*