X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=release.sh;h=cc59d6a2af7ce033fdd565eace9e277446e8f59b;hb=9bf346c7a00f0783e3754d45dda331ff91ec9a64;hp=c829f671dd22a17a3dc8e5362521b80899d7fb9e;hpb=25afa30f874f56a657ad0adc1f12e5a04f931e1b;p=i3%2Fi3
diff --git a/release.sh b/release.sh
index c829f671..cc59d6a2 100755
--- a/release.sh
+++ b/release.sh
@@ -1,14 +1,20 @@
#!/bin/zsh
# This script is used to prepare a new release of i3.
-export RELEASE_VERSION="4.10.2"
-export PREVIOUS_VERSION="4.10.1"
-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
+
+if ! (cd ../i3.github.io && git pull)
+then
+ echo "Could not update ../i3.github.io repository"
exit 1
fi
@@ -35,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."
@@ -50,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
@@ -62,24 +70,23 @@ 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}'"
git checkout next
- git merge --no-ff master -m "Merge branch 'master' into next"
+ git merge --no-ff -X ours master -m "Merge branch 'master' into next"
else
git checkout next
git merge --no-ff release-${RELEASE_VERSION} -m "Merge branch 'release-${RELEASE_VERSION}'"
git checkout master
- git merge --no-ff next -m "Merge branch 'next' into master"
+ git merge --no-ff -X theirs next -m "Merge branch 'next' into master"
fi
git remote remove origin
@@ -98,6 +105,7 @@ mkdir debian
# Copy over the changelog because we expect it to be locally modified in the
# start directory.
cp "${STARTDIR}/debian/changelog" i3/debian/changelog
+(cd i3 && git add debian/changelog && git commit -m 'Update debian/changelog')
cat > ${TMPDIR}/Dockerfile <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
Hi,
I just released i3 v${RELEASE_VERSION}. Release notes follow:
EOT
-cat ${TMPDIR}/i3/RELEASE-NOTES-${RELEASE_VERSION}.txt >>email.txt
+cat ${TMPDIR}/i3/RELEASE-NOTES-${RELEASE_VERSION} >>email.txt
################################################################################
# Section 5: final push instructions
@@ -204,6 +216,7 @@ echo "When satisfied, run:"
echo " cd ${TMPDIR}/i3"
echo " git checkout next"
echo " vi debian/changelog"
+echo " git commit -a -m \"debian: update changelog\""
echo " git push"
echo ""
echo " cd ${TMPDIR}/i3.github.io"
@@ -213,10 +226,9 @@ echo " cd ${TMPDIR}/debian"
echo " dput *.changes"
echo ""
echo " cd ${TMPDIR}"
-echo " sendmail < email.txt"
+echo " sendmail -t < email.txt"
echo ""
echo "Announce on:"
echo " twitter"
echo " google+"
-echo " mailing list"
echo " #i3 topic"