nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

travis: move (failing) ubuntu build from xenial to bionic 

Ubuntu’s apt started refusing to load package files from unauthenticated
repositories, but the package for which we did that (xcb-xrm) is available in
newer versions of Ubuntu, so I just removed that part altogether.

Apparently this has been broken since April, and nobody noticed :-/
This commit is contained in:
Michael Stapelberg 2018-11-04 15:24:10 +01:00
parent 86bcb21dbc
commit 07e5747c8c
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
travis/bintray-autobuild-ubuntu.json
View File

@ -15,7 +15,7 @@
{ {
"includePattern": "build/deb/ubuntu-amd64/(.*\\.deb)$", "includePattern": "build/deb/ubuntu-amd64/(.*\\.deb)$",
"matrixParams": { "matrixParams": {
"deb_distribution": "xenial", "deb_distribution": "bionic",
"deb_component": "main", "deb_component": "main",
"deb_architecture": "amd64" "deb_architecture": "amd64"
}, },
@ -24,7 +24,7 @@
{ {
"includePattern": "build/deb/ubuntu-i386/(.*\\.deb)$", "includePattern": "build/deb/ubuntu-i386/(.*\\.deb)$",
"matrixParams": { "matrixParams": {
"deb_distribution": "xenial", "deb_distribution": "bionic",
"deb_component": "main", "deb_component": "main",
"deb_architecture": "i386" "deb_architecture": "i386"
}, },

8
travis/travis-base-ubuntu-386.Dockerfile
View File

@ -1,7 +1,7 @@
# vim:ft=Dockerfile # vim:ft=Dockerfile
# Same as travis-base.Dockerfile, but without the test suite dependencies since # Same as travis-base.Dockerfile, but without the test suite dependencies since
# we only build Debian packages on Ubuntu i386, we don’t run the tests. # we only build Debian packages on Ubuntu i386, we don’t run the tests.
FROM i386/ubuntu:xenial FROM i386/ubuntu:bionic
RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
# Paper over occasional network flakiness of some mirrors. # Paper over occasional network flakiness of some mirrors.
@ -24,10 +24,6 @@ RUN linux32 apt-get update && \
# Install i3 build dependencies. # Install i3 build dependencies.
COPY debian/control /usr/src/i3-debian-packaging/control COPY debian/control /usr/src/i3-debian-packaging/control
RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' > /etc/apt/sources.list.d/i3-autobuild.list && \ RUN linux32 apt-get update && \
linux32 apt-get update && \
linux32 apt-get --allow-unauthenticated install i3-autobuild-keyring && \
rm -f /var/lib/apt/lists/dl.bintray.com_i3_i3-autobuild-ubuntu_* && \
linux32 apt-get update && \
DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

8
travis/travis-base-ubuntu.Dockerfile
View File

@ -1,7 +1,7 @@
# vim:ft=Dockerfile # vim:ft=Dockerfile
# Same as travis-base.Dockerfile, but without the test suite dependencies since # Same as travis-base.Dockerfile, but without the test suite dependencies since
# we only build Debian packages on Ubuntu, we don’t run the tests. # we only build Debian packages on Ubuntu, we don’t run the tests.
FROM ubuntu:xenial FROM ubuntu:bionic
RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
# Paper over occasional network flakiness of some mirrors. # Paper over occasional network flakiness of some mirrors.
@ -25,10 +25,6 @@ RUN apt-get update && \
# Install i3 build dependencies. # Install i3 build dependencies.
COPY debian/control /usr/src/i3-debian-packaging/control COPY debian/control /usr/src/i3-debian-packaging/control
RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' > /etc/apt/sources.list.d/i3-autobuild.list && \ RUN apt-get update && \
apt-get update && \
apt-get --allow-unauthenticated install i3-autobuild-keyring && \
rm -f /var/lib/apt/lists/dl.bintray.com_i3_i3-autobuild-ubuntu_* && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \ DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*