From f027deeaa8bf21769d83a35ac37ede21f035c0ad Mon Sep 17 00:00:00 2001
From: Jiayu Liu <Jimexist@users.noreply.github.com>
Date: Mon, 19 Sep 2022 14:26:37 +0800
Subject: THRIFT-5574: add ubuntu focal build (#2528)

* add ubuntu focal build

* remove py2 in focal

* indentation

* apply latest updates

* update swift version

* use java 17 in focal

* adopt focal
---
 .travis.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index e511c4704..9b00fc61c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@
 
 sudo: required
 # https://docs.travis-ci.com/user/reference/linux
-dist: xenial
+dist: focal
 language: cpp
 
 services:
@@ -47,7 +47,7 @@ env:
     - SCRIPT="cmake.sh"
     - BUILD_ARG=""
     - BUILD_ENV="-e CC=gcc -e CXX=g++ -e THRIFT_CROSSTEST_CONCURRENCY=4"
-    - DISTRO=ubuntu-bionic
+    - DISTRO=ubuntu-focal
     - BUILD_LIBS="CPP C_GLIB 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)
@@ -69,6 +69,11 @@ jobs:
         - JOB="Docker Build ubuntu-bionic 18.04 LTS"
         - DISTRO=ubuntu-bionic
         - TRAVIS_BUILD_STAGE=docker
+    - script: true
+      env:
+        - JOB="Docker Build ubuntu-focal 20.04 LTS"
+        - DISTRO=ubuntu-focal
+        - TRAVIS_BUILD_STAGE=docker
 
     # ========================= stage: thrift =======================
     # ------------------------- phase: cross ------------------------
@@ -123,6 +128,12 @@ jobs:
         - DISTRO=ubuntu-xenial
         - SCRIPT="autotools.sh"
 
+    - script: build/docker/run.sh
+      env:
+        - JOB="Autotools (Ubuntu Focal)"
+        - DISTRO=ubuntu-focal
+        - SCRIPT="autotools.sh"
+
     # ------------------------- phase: cmake ------------------------
     - script: build/docker/run.sh
       env:
-- 
cgit v1.2.1