travis: build ubuntu packages for xenial, not wily (#2474)
The extra rm command when configuring the repository is necessary
because of https://bugs.debian.org/838779.
Michael Stapelberg authored 7 years ago
GitHub committed 7 years ago
14 | 14 |
{
|
15 | 15 |
"includePattern": "deb/ubuntu-amd64/(.*\\.deb)$",
|
16 | 16 |
"matrixParams": {
|
17 | |
"deb_distribution": "wily",
|
|
17 |
"deb_distribution": "xenial",
|
18 | 18 |
"deb_component": "main",
|
19 | 19 |
"deb_architecture": "amd64"
|
20 | 20 |
},
|
|
23 | 23 |
{
|
24 | 24 |
"includePattern": "deb/ubuntu-i386/(.*\\.deb)$",
|
25 | 25 |
"matrixParams": {
|
26 | |
"deb_distribution": "wily",
|
|
26 |
"deb_distribution": "xenial",
|
27 | 27 |
"deb_component": "main",
|
28 | 28 |
"deb_architecture": "i386"
|
29 | 29 |
},
|
0 | 0 |
# vim:ft=Dockerfile
|
1 | 1 |
# Same as travis-base.Dockerfile, but without the test suite dependencies since
|
2 | 2 |
# we only build Debian packages on Ubuntu i386, we don’t run the tests.
|
3 | |
FROM i386/ubuntu:wily
|
|
3 |
FROM i386/ubuntu:xenial
|
4 | 4 |
|
5 | 5 |
RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
|
6 | 6 |
# Paper over occasional network flakiness of some mirrors.
|
|
23 | 23 |
|
24 | 24 |
# Install i3 build dependencies.
|
25 | 25 |
COPY debian/control /usr/src/i3-debian-packaging/control
|
26 | |
RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu wily main' > /etc/apt/sources.list.d/i3-autobuild.list && \
|
|
26 |
RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' > /etc/apt/sources.list.d/i3-autobuild.list && \
|
27 | 27 |
linux32 apt-get update && \
|
28 | 28 |
linux32 apt-get --allow-unauthenticated install i3-autobuild-keyring && \
|
|
29 |
rm -f /var/lib/apt/lists/dl.bintray.com_i3_i3-autobuild-ubuntu_* && \
|
29 | 30 |
linux32 apt-get update && \
|
30 | 31 |
DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
|
31 | 32 |
rm -rf /var/lib/apt/lists/*
|
0 | 0 |
# vim:ft=Dockerfile
|
1 | 1 |
# Same as travis-base.Dockerfile, but without the test suite dependencies since
|
2 | 2 |
# we only build Debian packages on Ubuntu, we don’t run the tests.
|
3 | |
FROM ubuntu:wily
|
|
3 |
FROM ubuntu:xenial
|
4 | 4 |
|
5 | 5 |
RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
|
6 | 6 |
# Paper over occasional network flakiness of some mirrors.
|
|
24 | 24 |
|
25 | 25 |
# Install i3 build dependencies.
|
26 | 26 |
COPY debian/control /usr/src/i3-debian-packaging/control
|
27 | |
RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu wily main' > /etc/apt/sources.list.d/i3-autobuild.list && \
|
|
27 |
RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' > /etc/apt/sources.list.d/i3-autobuild.list && \
|
28 | 28 |
apt-get update && \
|
29 | 29 |
apt-get --allow-unauthenticated install i3-autobuild-keyring && \
|
|
30 |
rm -f /var/lib/apt/lists/dl.bintray.com_i3_i3-autobuild-ubuntu_* && \
|
30 | 31 |
apt-get update && \
|
31 | 32 |
DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
|
32 | 33 |
rm -rf /var/lib/apt/lists/*
|