From 07e5747c8c386cceffd4e1cf9e9dc54f949e1469 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 4 Nov 2018 15:24:10 +0100 Subject: [PATCH] travis: move (failing) ubuntu build from xenial to bionic MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 :-/ --- travis/bintray-autobuild-ubuntu.json | 4 ++-- travis/travis-base-ubuntu-386.Dockerfile | 8 ++------ travis/travis-base-ubuntu.Dockerfile | 8 ++------ 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/travis/bintray-autobuild-ubuntu.json b/travis/bintray-autobuild-ubuntu.json index 948f3dc4..37f2f180 100644 --- a/travis/bintray-autobuild-ubuntu.json +++ b/travis/bintray-autobuild-ubuntu.json @@ -15,7 +15,7 @@ { "includePattern": "build/deb/ubuntu-amd64/(.*\\.deb)$", "matrixParams": { - "deb_distribution": "xenial", + "deb_distribution": "bionic", "deb_component": "main", "deb_architecture": "amd64" }, @@ -24,7 +24,7 @@ { "includePattern": "build/deb/ubuntu-i386/(.*\\.deb)$", "matrixParams": { - "deb_distribution": "xenial", + "deb_distribution": "bionic", "deb_component": "main", "deb_architecture": "i386" }, diff --git a/travis/travis-base-ubuntu-386.Dockerfile b/travis/travis-base-ubuntu-386.Dockerfile index 82e5ca29..c71ad42d 100644 --- a/travis/travis-base-ubuntu-386.Dockerfile +++ b/travis/travis-base-ubuntu-386.Dockerfile @@ -1,7 +1,7 @@ # vim:ft=Dockerfile # 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. -FROM i386/ubuntu:xenial +FROM i386/ubuntu:bionic RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup # Paper over occasional network flakiness of some mirrors. @@ -24,10 +24,6 @@ RUN linux32 apt-get update && \ # Install i3 build dependencies. 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 && \ - 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 && \ +RUN 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 && \ rm -rf /var/lib/apt/lists/* diff --git a/travis/travis-base-ubuntu.Dockerfile b/travis/travis-base-ubuntu.Dockerfile index 05066ec8..6b61e27e 100644 --- a/travis/travis-base-ubuntu.Dockerfile +++ b/travis/travis-base-ubuntu.Dockerfile @@ -1,7 +1,7 @@ # vim:ft=Dockerfile # 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. -FROM ubuntu:xenial +FROM ubuntu:bionic RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup # Paper over occasional network flakiness of some mirrors. @@ -25,10 +25,6 @@ RUN apt-get update && \ # Install i3 build dependencies. 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 && \ - 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 && \ +RUN apt-get update && \ 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/* -- 2.39.5