From f5f430df56871bc937950274b2c86681d3db6e59 Mon Sep 17 00:00:00 2001 From: "James E. King III" Date: Fri, 8 Jun 2018 03:37:55 +0000 Subject: THRIFT-4579: Move up to Ubuntu Bionic for CI builds make dlang library compatible with openssl-1.1 for Ubuntu Bionic Requires an upstream deimos update to be compatible. --- .travis.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index b3a6a2672..daee7b322 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ env: - SCRIPT="cmake.sh" - BUILD_ARG="" - BUILD_ENV="-e CC=gcc -e CXX=g++ -e THRIFT_CROSSTEST_CONCURRENCY=4" - - DISTRO=ubuntu-artful + - DISTRO=ubuntu-bionic - BUILD_LIBS="CPP C_GLIB HASKELL JAVA PYTHON TESTING TUTORIALS" # only meaningful for CMake builds - TRAVIS_BUILD_STAGE=test # DOCKER_REPO (this works for all builds as a source for docker images - you can override for fork builds in your Travis settings) @@ -57,13 +57,13 @@ jobs: - stage: docker script: true env: - - JOB="Docker Build ubuntu-xenial 16.04" + - JOB="Docker Build ubuntu-xenial 16.04 LTS" - DISTRO=ubuntu-xenial - TRAVIS_BUILD_STAGE=docker - script: true env: - - JOB="Docker Build ubuntu-artful 17.10" - - DISTRO=ubuntu-artful + - JOB="Docker Build ubuntu-bionic 18.04 LTS" + - DISTRO=ubuntu-bionic - TRAVIS_BUILD_STAGE=docker # ========================= stage: thrift ======================= @@ -144,8 +144,7 @@ jobs: # TODO: Remove them once migrated to CMake - script: build/docker/run.sh env: - - JOB="Autotools (Ubuntu Artful)" - - DISTRO=ubuntu-artful + - JOB="Autotools (Ubuntu Bionic)" - SCRIPT="autotools.sh" - script: build/docker/run.sh @@ -158,13 +157,11 @@ jobs: - script: build/docker/run.sh env: - JOB="make dist" - - DISTRO=ubuntu-artful - SCRIPT="make-dist.sh" - script: build/docker/run.sh env: - JOB="Debian Packages" - - DISTRO=ubuntu-artful - SCRIPT="dpkg.sh" ### ------------------------- phase: osx ------------------------- -- cgit v1.2.1