From f5ab2c919f5cb8d9f5bef0b4ee09252c37a821cb Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 22 Apr 2020 09:32:22 +0200
Subject: [PATCH 1/3] release.sh: use diff --color

colordiff is no longer necessary, and not installed on many systems.
---
 release.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/release.sh b/release.sh
index 095bc50b..c581d292 100755
--- a/release.sh
+++ b/release.sh
@@ -69,11 +69,9 @@ cp build/i3-${RELEASE_VERSION}.tar.bz2 .
 
 echo "Differences in the release tarball file lists:"
 
-diff -u \
+diff --color -u \
 	<(tar tf ../i3-${PREVIOUS_VERSION}.tar.bz2 | sed "s,i3-${PREVIOUS_VERSION}/,,g" | sort) \
-	<(tar tf    i3-${RELEASE_VERSION}.tar.bz2  | sed "s,i3-${RELEASE_VERSION}/,,g"  | sort) \
-	| colordiff
-
+	<(tar tf    i3-${RELEASE_VERSION}.tar.bz2  | sed "s,i3-${RELEASE_VERSION}/,,g"  | sort)
 
 gpg --armor -b i3-${RELEASE_VERSION}.tar.bz2
 

From c4ffc0f5e14bccdb54572e137b054415fc010af2 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 22 Apr 2020 09:32:38 +0200
Subject: [PATCH 2/3] release.sh: docker build: use --no-cache
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This avoids issues with stale caches. We rather don’t use caching at all:
release.sh is only run once per release.
---
 release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/release.sh b/release.sh
index c581d292..3a2210fb 100755
--- a/release.sh
+++ b/release.sh
@@ -128,7 +128,7 @@ RUN dpkg-buildpackage -S -sa -j8
 EOT
 
 CONTAINER_NAME=$(echo "i3-${TMPDIR}" | sed 's,/,,g')
-docker build -t i3 .
+docker build --no-cache -t i3 .
 for file in $(docker run --name "${CONTAINER_NAME}" i3 /bin/sh -c "ls /usr/src/i3*_${RELEASE_VERSION}*")
 do
 	docker cp "${CONTAINER_NAME}:${file}" ${TMPDIR}/debian/

From 8f0b92cae2d38bc7e604b3bb3948bf83959934f5 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 22 Apr 2020 09:33:11 +0200
Subject: [PATCH 3/3] release.sh: update versions

---
 release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release.sh b/release.sh
index 3a2210fb..3335aa4a 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.17"
-export PREVIOUS_VERSION="4.16"
+export RELEASE_VERSION="4.19"
+export PREVIOUS_VERSION="4.18"
 export RELEASE_BRANCH="next"
 
 if [ ! -e "../i3.github.io" ]