From 3b9afe4f5ae36376a83acc6c47c9d4018a705870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 14 Nov 2023 13:39:42 +0100 Subject: [PATCH] release: build images before comitting the changelog This makes it easy to re-attempt a botched build. --- release.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/release.sh b/release.sh index b5fbae8..98c1e57 100755 --- a/release.sh +++ b/release.sh @@ -25,8 +25,8 @@ VERSION="${RELEASE}-${V}" echo "Releasing ${VERSION}" if git rev-parse "${VERSION}" >/dev/null 2>&1; then - echo "Tag for such version already exists!" - exit 1 + echo "Tag for such version already exists!" + exit 1 fi # Prepare changelog @@ -38,6 +38,14 @@ CHANGES=$(git log --oneline --no-decorate --no-merges ${LAST_VERSION}..HEAD --pr echo "Changelog:" echo "$CHANGES" +# Tag Docker images and push them to DockerHub +# + +JITSI_BUILD=${VERSION} JITSI_RELEASE=${RELEASE} make release + +# Changelog +# + echo -e "## ${VERSION}\n\nBased on ${RELEASE} release ${V}.\n\n${CHANGES}\n" > tmp cat CHANGELOG.md >> tmp mv tmp CHANGELOG.md @@ -53,11 +61,6 @@ sed -i "" -e "s/unstable/${VERSION}/" *.yml git commit -a -m "release: ${VERSION}" -m "${CHANGES}" git tag -a "${VERSION}" -m "release" -m "${CHANGES}" -# Tag Docker images and push them to DockerHub -# - -JITSI_BUILD=${VERSION} JITSI_RELEASE=${RELEASE} make release - # Revert back to "unstable" for development #