Skip to content
This repository has been archived by the owner on Apr 18, 2023. It is now read-only.

Commit

Permalink
travis: move (failing) ubuntu build from xenial to bionic
Browse files Browse the repository at this point in the history
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 :-/
  • Loading branch information
stapelberg committed Nov 4, 2018
1 parent 86bcb21 commit 07e5747
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
4 changes: 2 additions & 2 deletions travis/bintray-autobuild-ubuntu.json
Expand Up @@ -15,7 +15,7 @@
{
"includePattern": "build/deb/ubuntu-amd64/(.*\\.deb)$",
"matrixParams": {
"deb_distribution": "xenial",
"deb_distribution": "bionic",
"deb_component": "main",
"deb_architecture": "amd64"
},
Expand All @@ -24,7 +24,7 @@
{
"includePattern": "build/deb/ubuntu-i386/(.*\\.deb)$",
"matrixParams": {
"deb_distribution": "xenial",
"deb_distribution": "bionic",
"deb_component": "main",
"deb_architecture": "i386"
},
Expand Down
8 changes: 2 additions & 6 deletions 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.
Expand All @@ -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/*
8 changes: 2 additions & 6 deletions 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.
Expand All @@ -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/*

0 comments on commit 07e5747

Please sign in to comment.