Fix travis-ci build scripts broken by c59f195

diff --git a/.travis.yml b/.travis.yml
index c260b1ec8e8ca701f5faf7b64e557e8612770be8..ae729b447d05d131667922e41344db53174c7c88 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ language: minimal
 env:
   - DOCKER=centos6
   - DOCKER=centos7
-  - DOCKER=trusty
   - DOCKER=xenial
 
 matrix:
@@ -19,9 +18,10 @@ matrix:
 
   - language: java
     # We're not compatible with the newer java
-    dist: trusty
+    dist: xenial
     env:
-    before_install: skip
+    before_install:
+    - sudo apt-get install -y openjdk-8-jdk
     script:
     - cd java && cmake . && make
 

diff --git a/.travis/trusty/Dockerfile b/.travis/trusty/Dockerfile
deleted file mode 100644 (file)
index 0a41647..0000000
--- a/.travis/trusty/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM ubuntu:trusty
-
-RUN apt-get update
-RUN apt-get -y install packaging-dev equivs
-
-RUN useradd -s /bin/bash -m deb
-RUN echo >> /etc/sudoers
-RUN echo "deb ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-
-USER deb
-WORKDIR /home/deb

diff --git a/.travis/trusty/build.sh b/.travis/trusty/build.sh
deleted file mode 100755 (executable)
index 08076da..0000000
--- a/.travis/trusty/build.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-## Basic variables
-
-CURDIR=$(dirname $(readlink -f $0))
-TOPDIR=$(git rev-parse --show-toplevel 2>/dev/null)
-
-DEBDIR=${TOPDIR}/contrib/packages/deb/ubuntu-trusty
-
-VERSION=$(grep '^set(VERSION ' ${TOPDIR}/CMakeLists.txt | sed 's@^set(VERSION \(.*\))@\1@')
-
-## Prepare the build directory
-
-rm -rf ${CURDIR}/build
-mkdir -p ${CURDIR}/build
-chmod a+w ${CURDIR}/build
-[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled && chcon -Rt container_file_t ${CURDIR}/build
-
-## Copy over the source code
-
-(cd ${TOPDIR} && git archive --prefix tigervnc-${VERSION}/ HEAD) | xz > ${CURDIR}/build/tigervnc-${VERSION}.tar.xz
-
-# Extra dependencies built because the distribution lacks what we need
-
-curl -L -o ${CURDIR}/build/fltk-1.3.4-2-source.tar.gz https://www.fltk.org/pub/fltk/1.3.4/fltk-1.3.4-2-source.tar.gz
-
-# Bundle up everything
-
-tar -C ${CURDIR}/build -axf ${CURDIR}/build/tigervnc-${VERSION}.tar.xz
-tar -C ${CURDIR}/build/tigervnc-${VERSION} -axf ${CURDIR}/build/fltk-1.3.4-2-source.tar.gz
-tar -C ${CURDIR}/build -acf ${CURDIR}/build/tigervnc_${VERSION}.orig.tar.xz tigervnc-${VERSION}
-rm -rf ${CURDIR}/build/tigervnc-${VERSION}
-
-## Copy over the packaging files
-
-cp -r ${DEBDIR}/debian ${CURDIR}/build/debian
-
-chmod a+x ${CURDIR}/build/debian/rules
-
-# Assemble a fake changelog entry to get the correct version
-
-cat - > ${CURDIR}/build/debian/changelog << EOT
-tigervnc (${VERSION}-1ubuntu1) UNRELEASED; urgency=low
-
-  * Automated build for TigerVNC
-
- -- Build bot <tigervncbot@tigervnc.org>  $(date -R)
-
-EOT
-cat ${DEBDIR}/debian/changelog >> ${CURDIR}/build/debian/changelog
-
-## Start the build
-
-docker run --volume ${CURDIR}/build:/home/deb/build --interactive --tty --rm tigervnc/${DOCKER} \
-       bash -c "
-       tar -C ~/build -axf ~/build/tigervnc_${VERSION}.orig.tar.xz &&
-       cp -a ~/build/debian ~/build/tigervnc-${VERSION}/debian &&
-       mk-build-deps ~/build/tigervnc-${VERSION}/debian/control &&
-       sudo dpkg --unpack ~/tigervnc-build-deps_*.deb &&
-       sudo apt-get -f install -y &&
-       cd ~/build/tigervnc-${VERSION} && dpkg-buildpackage
-       "