X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=blobdiff_plain;f=release.sh;h=0190fcfb4f575c1bd77061219bb7a175f2d26071;hp=33b8dcd63f3a799ba6203a330d553bb6779be0a3;hb=HEAD;hpb=ef6f2f43659e04f7eb3da117581fd09f16fca618 diff --git a/release.sh b/release.sh index 33b8dcd6..0190fcfb 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.15" +export PREVIOUS_VERSION="4.14" +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." @@ -55,11 +55,17 @@ git checkout -b release-${RELEASE_VERSION} cp "${STARTDIR}/RELEASE-NOTES-${RELEASE_VERSION}" "RELEASE-NOTES-${RELEASE_VERSION}" git add RELEASE-NOTES-${RELEASE_VERSION} git rm RELEASE-NOTES-${PREVIOUS_VERSION} -sed -i "s,[^<]*,${RELEASE_VERSION},g" man/asciidoc.conf +sed -i "s,RELEASE-NOTES-${PREVIOUS_VERSION},RELEASE-NOTES-${RELEASE_VERSION},g" Makefile.am +sed -i "s/AC_INIT(\[i3\], \[${PREVIOUS_VERSION}\]/AC_INIT([i3], [${RELEASE_VERSION}]/" configure.ac +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 -make dist +autoreconf -fi +mkdir build +(cd build && ../configure && make dist-bzip2 -j8) +cp build/i3-${RELEASE_VERSION}.tar.bz2 . echo "Differences in the release tarball file lists:" @@ -68,24 +74,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 -X ours master -m "Merge branch 'master' into next" + git merge --no-ff -s recursive -X ours -X no-renames 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 -X theirs next -m "Merge branch 'next' into master" + git merge --no-ff -s recursive -X theirs -X no-renames next -m "Merge branch 'next' into master" fi git remote remove origin @@ -121,6 +126,7 @@ WORKDIR /usr/src RUN mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' i3-${RELEASE_VERSION}/debian/control WORKDIR /usr/src/i3-${RELEASE_VERSION} RUN dpkg-buildpackage -sa -j8 +RUN dpkg-buildpackage -S -sa -j8 EOT CONTAINER_NAME=$(echo "i3-${TMPDIR}" | sed 's,/,,g') @@ -134,7 +140,7 @@ echo "Content of resulting package’s .changes file:" cat ${TMPDIR}/debian/*.changes # debsign is in devscripts, which is available in fedora and debian -debsign -k4AC8EE1D ${TMPDIR}/debian/*.changes +debsign --no-re-sign -k4AC8EE1D ${TMPDIR}/debian/*.changes # TODO: docker cleanup @@ -156,7 +162,7 @@ git add downloads/RELEASE-NOTES-${RELEASE_VERSION}.txt sed -i "s,

Documentation for i3 v[^<]*

,

Documentation for i3 v${RELEASE_VERSION}

,g" docs/index.html sed -i "s,[^<]*,${RELEASE_VERSION},g" index.html sed -i "s,The current stable version is .*$,The current stable version is ${RELEASE_VERSION}.,g" downloads/index.html -sed -i "s,,\n \n ${RELEASE_VERSION}\n i3-${RELEASE_VERSION}.tar.bz2\n $(ls -lh ../i3/i3-${RELEASE_VERSION}.tar.bz2 | awk -F " " {'print $5'} | sed 's/K$/ KiB/g')\n signature\n $(date +'%Y-%m-%d')\n release notes\n \n,g" downloads/index.html +sed -i "s,,\n \n ${RELEASE_VERSION}\n i3-${RELEASE_VERSION}.tar.bz2\n $(LC_ALL=en_US.UTF-8 ls -lh ../i3/i3-${RELEASE_VERSION}.tar.bz2 | awk -F " " {'print $5'} | sed 's/K$/ KiB/g' | sed 's/M$/ MiB/g')\n signature\n $(date +'%Y-%m-%d')\n release notes\n \n,g" downloads/index.html git commit -a -m "add ${RELEASE_VERSION} release" @@ -194,7 +200,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 @@ -222,12 +228,17 @@ echo " cd ${TMPDIR}/i3.github.io" echo " git push" echo "" echo " cd ${TMPDIR}/debian" -echo " dput *.changes" +echo " dput" echo "" echo " cd ${TMPDIR}" echo " sendmail -t < email.txt" echo "" +echo "Update milestones on GitHub (only for new major versions):" +echo " Set due date of ${RELEASE_VERSION} to $(date +'%Y-%m-%d') and close the milestone" +echo " Create milestone for the next major version with unset due date" +echo "" echo "Announce on:" echo " twitter" echo " google+" echo " #i3 topic" +echo " reddit /r/i3wm"