Merge pull request #4032 from stapelberg/release-sh

release.sh fixes from last release
This commit is contained in:
Ingo Bürk 2020-04-22 11:07:17 +02:00 committed by GitHub
commit 4d55bba7f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions

View File

@ -1,8 +1,8 @@
#!/bin/zsh #!/bin/zsh
# This script is used to prepare a new release of i3. # This script is used to prepare a new release of i3.
export RELEASE_VERSION="4.17" export RELEASE_VERSION="4.19"
export PREVIOUS_VERSION="4.16" export PREVIOUS_VERSION="4.18"
export RELEASE_BRANCH="next" export RELEASE_BRANCH="next"
if [ ! -e "../i3.github.io" ] if [ ! -e "../i3.github.io" ]
@ -69,11 +69,9 @@ cp build/i3-${RELEASE_VERSION}.tar.bz2 .
echo "Differences in the release tarball file lists:" 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-${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) \ <(tar tf i3-${RELEASE_VERSION}.tar.bz2 | sed "s,i3-${RELEASE_VERSION}/,,g" | sort)
| colordiff
gpg --armor -b i3-${RELEASE_VERSION}.tar.bz2 gpg --armor -b i3-${RELEASE_VERSION}.tar.bz2
@ -130,7 +128,7 @@ RUN dpkg-buildpackage -S -sa -j8
EOT EOT
CONTAINER_NAME=$(echo "i3-${TMPDIR}" | sed 's,/,,g') 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}*") for file in $(docker run --name "${CONTAINER_NAME}" i3 /bin/sh -c "ls /usr/src/i3*_${RELEASE_VERSION}*")
do do
docker cp "${CONTAINER_NAME}:${file}" ${TMPDIR}/debian/ docker cp "${CONTAINER_NAME}:${file}" ${TMPDIR}/debian/