X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=release.sh;h=b3e8461050824771a607ededce752c2a2969b1ab;hb=2248085c5c4daf571b93b14a2a1aa35cfc8d63d7;hp=c75051798aa8f0502516c665967c9d5f342ba4b0;hpb=d9f483e9469548c2a7245bf9999d11e724c76df1;p=i3%2Fi3

diff --git a/release.sh b/release.sh
index c7505179..b3e84610 100755
--- a/release.sh
+++ b/release.sh
@@ -1,9 +1,9 @@
 #!/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.11"
+export PREVIOUS_VERSION="4.10.4"
+export RELEASE_BRANCH="next"
 
 if [ ! -e "../i3.github.io" ]
 then
@@ -12,6 +12,12 @@ then
 	exit 1
 fi
 
+if ! (cd ../i3.github.io && git pull)
+then
+	echo "Could not update ../i3.github.io repository"
+	exit 1
+fi
+
 if [ ! -e "RELEASE-NOTES-${RELEASE_VERSION}" ]
 then
 	echo "RELEASE-NOTES-${RELEASE_VERSION} not found."
@@ -74,12 +80,12 @@ 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 +104,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 <<EOT
 FROM debian:sid
@@ -135,6 +142,10 @@ debsign -k4AC8EE1D ${TMPDIR}/debian/*.changes
 # Section 3: website
 ################################################################################
 
+# Ensure we are in the correct branch for copying the docs.
+cd ${TMPDIR}/i3
+git checkout ${RELEASE_BRANCH}
+
 cd ${TMPDIR}
 git clone --quiet ${STARTDIR}/../i3.github.io
 cd i3.github.io
@@ -157,21 +168,24 @@ git commit -a -m "save docs for ${PREVIOUS_VERSION}"
 for i in $(find _docs -maxdepth 1 -and -type f -and \! -regex ".*\.\(html\|man\)$" -and \! -name "Makefile")
 do
 	base="$(basename $i)"
-	[ -e "${STARTDIR}/docs/${base}" ] && cp "${STARTDIR}/docs/${base}" "_docs/${base}"
+	[ -e "${TMPDIR}/i3/docs/${base}" ] && cp "${TMPDIR}/i3/docs/${base}" "_docs/${base}"
 done
 
+sed -i "s,Verify you are using i3 ≥ .*,Verify you are using i3 ≥ ${RELEASE_VERSION},g" _docs/debugging
+
 (cd _docs && make)
 
 for i in $(find _docs -maxdepth 1 -and -type f -and \! -regex ".*\.\(html\|man\)$" -and \! -name "Makefile")
 do
 	base="$(basename $i)"
-	[ -e "${STARTDIR}/docs/${base}" ] && cp "_docs/${base}.html" docs/
+	[ -e "${TMPDIR}/i3/docs/${base}" ] && cp "_docs/${base}.html" docs/
 done
 
 git commit -a -m "update docs for ${RELEASE_VERSION}"
 
 git remote remove origin
 git remote add origin git@github.com:i3/i3.github.io.git
+git config --add remote.origin.push "+refs/heads/master:refs/heads/master"
 
 ################################################################################
 # Section 4: prepare release announcement email
@@ -182,12 +196,14 @@ cat >email.txt <<EOT
 From: Michael Stapelberg <michael@i3wm.org>
 To: i3-announce@i3.zekjur.net
 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
@@ -199,6 +215,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"
@@ -208,10 +225,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"