X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=release.sh;h=cc59d6a2af7ce033fdd565eace9e277446e8f59b;hb=9bf346c7a00f0783e3754d45dda331ff91ec9a64;hp=33b8dcd63f3a799ba6203a330d553bb6779be0a3;hpb=c9b6ec71aa0c805c6dd4be05b1cf440e23df1a4c;p=i3%2Fi3
diff --git a/release.sh b/release.sh
index 33b8dcd6..cc59d6a2 100755
--- a/release.sh
+++ b/release.sh
@@ -1,14 +1,14 @@
#!/bin/zsh
# This script is used to prepare a new release of i3.
-export RELEASE_VERSION="4.10.4"
-export PREVIOUS_VERSION="4.10.3"
-export RELEASE_BRANCH="master"
+export RELEASE_VERSION="4.12"
+export PREVIOUS_VERSION="4.11"
+export RELEASE_BRANCH="next"
if [ ! -e "../i3.github.io" ]
then
echo "../i3.github.io does not exist."
- echo "Use git clone git://github.com/i3/i3.github.io"
+ echo "Use git clone https://github.com/i3/i3.github.io"
exit 1
fi
@@ -41,11 +41,11 @@ STARTDIR=$PWD
TMPDIR=$(mktemp -d)
cd $TMPDIR
-if ! wget http://i3wm.org/downloads/i3-${PREVIOUS_VERSION}.tar.bz2; then
+if ! wget https://i3wm.org/downloads/i3-${PREVIOUS_VERSION}.tar.bz2; then
echo "Could not download i3-${PREVIOUS_VERSION}.tar.bz2 (required for comparing files)."
exit 1
fi
-git clone --quiet --branch "${RELEASE_BRANCH}" file://${STARTDIR}
+git clone --quiet --branch "${RELEASE_BRANCH}" https://github.com/i3/i3
cd i3
if [ ! -e "${STARTDIR}/RELEASE-NOTES-${RELEASE_VERSION}" ]; then
echo "Required file RELEASE-NOTES-${RELEASE_VERSION} not found."
@@ -56,6 +56,8 @@ cp "${STARTDIR}/RELEASE-NOTES-${RELEASE_VERSION}" "RELEASE-NOTES-${RELEASE_VERSI
git add RELEASE-NOTES-${RELEASE_VERSION}
git rm RELEASE-NOTES-${PREVIOUS_VERSION}
sed -i "s,[^<]*,${RELEASE_VERSION},g" man/asciidoc.conf
+echo "${RELEASE_VERSION} ($(date +%F))" > I3_VERSION
+git add I3_VERSION
git commit -a -m "release i3 ${RELEASE_VERSION}"
git tag "${RELEASE_VERSION}" -m "release i3 ${RELEASE_VERSION}" --sign --local-user=0x4AC8EE1D
@@ -68,14 +70,13 @@ diff -u \
<(tar tf i3-${RELEASE_VERSION}.tar.bz2 | sed "s,i3-${RELEASE_VERSION}/,,g" | sort) \
| colordiff
-if ! tar xf i3-${RELEASE_VERSION}.tar.bz2 --to-stdout --strip-components=1 i3-${RELEASE_VERSION}/I3_VERSION | grep -q "^${RELEASE_VERSION} "
-then
- echo "I3_VERSION file does not start with ${RELEASE_VERSION}"
- exit 1
-fi
gpg --armor -b i3-${RELEASE_VERSION}.tar.bz2
+echo "${RELEASE_VERSION}-non-git" > I3_VERSION
+git add I3_VERSION
+git commit -a -m "Set non-git version to ${RELEASE_VERSION}-non-git."
+
if [ "${RELEASE_BRANCH}" = "master" ]; then
git checkout master
git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
@@ -194,7 +195,7 @@ git config --add remote.origin.push "+refs/heads/master:refs/heads/master"
cd ${TMPDIR}
cat >email.txt <
-To: i3-announce@i3.zekjur.net
+To: i3-announce@freelists.org
Subject: i3 v${RELEASE_VERSION} released
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit