summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2016-07-29 09:10:02 +0200
committerFlorian Bruhin <git@the-compiler.org>2016-08-02 11:20:12 +0200
commit66a76a45043fddeb2a873329fa0ab39dec2dc108 (patch)
tree940e2ebd8079a3ce0b3a49ba6a4eafd28a67e26c
parentfeb73f06c5d6cb2621a5b9797b5b7fd7956fb58e (diff)
downloadqutebrowser-66a76a45043fddeb2a873329fa0ab39dec2dc108.tar.gz
qutebrowser-66a76a45043fddeb2a873329fa0ab39dec2dc108.zip
travis: Remove testing on Ubuntu Wily
-rw-r--r--.travis.yml3
-rw-r--r--misc/docker/ubuntu-wily/Dockerfile37
2 files changed, 0 insertions, 40 deletions
diff --git a/.travis.yml b/.travis.yml
index f7c52150f..449230232 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,6 @@ matrix:
env: DOCKER=archlinux
services: docker
- os: linux
- env: DOCKER=ubuntu-wily
- services: docker
- - os: linux
env: DOCKER=ubuntu-xenial
services: docker
- os: osx
diff --git a/misc/docker/ubuntu-wily/Dockerfile b/misc/docker/ubuntu-wily/Dockerfile
deleted file mode 100644
index 4eaf311f3..000000000
--- a/misc/docker/ubuntu-wily/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM ubuntu:wily
-MAINTAINER Florian Bruhin <me@the-compiler.org>
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get -y update && \
- apt-get -y dist-upgrade && \
- apt-get -y install --no-install-recommends \
- python3-pyqt5 \
- python3-pyqt5.qtwebkit \
- python-tox \
- python3-sip \
- xvfb \
- git \
- python3-setuptools \
- wget \
- herbstluftwm \
- language-pack-en \
- libjs-pdf \
- dbus
-
-RUN dbus-uuidgen --ensure
-
-RUN useradd user && mkdir /home/user && chown -R user:users /home/user
-USER user
-WORKDIR /home/user
-
-ENV DISPLAY=:0
-ENV LC_ALL=en_US.UTF-8
-ENV LANG=en_US.UTF-8
-
-CMD Xvfb -screen 0 800x600x24 :0 & \
- sleep 2 && \
- herbstluftwm & \
- git clone /outside qutebrowser.git && \
- cd qutebrowser.git && \
- tox -e py34