X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=release.sh;h=0190fcfb4f575c1bd77061219bb7a175f2d26071;hb=0ed29f567866ad00a2cb14ce2e6eb5a29b277011;hp=61b3c444e4d247253a4e1f212ef1c48b9792e82f;hpb=86f00fdda0dd35d4be92533629c3d8e6f654bb45;p=i3%2Fi3
diff --git a/release.sh b/release.sh
index 61b3c444..0190fcfb 100755
--- a/release.sh
+++ b/release.sh
@@ -1,8 +1,8 @@
#!/bin/zsh
# This script is used to prepare a new release of i3.
-export RELEASE_VERSION="4.12"
-export PREVIOUS_VERSION="4.11"
+export RELEASE_VERSION="4.15"
+export PREVIOUS_VERSION="4.14"
export RELEASE_BRANCH="next"
if [ ! -e "../i3.github.io" ]
@@ -55,14 +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
-echo "${RELEASE_VERSION}" > VERSION
+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 VERSION 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:"
@@ -82,12 +85,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 -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
@@ -123,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')
@@ -136,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
@@ -158,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"
@@ -224,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"