[Skiboot] [PATCH 03/15] travis: Update config

[Oliver O'Halloran]

Move to using Ubuntu 18.04 rather than 14.04 (which has been out of
support for years now) and fix up some warnings from the config file
checker.

Signed-off-by: Oliver O'Halloran <oohall at gmail.com>
---
 .travis.yml | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 44079e669fde..da07f200a001 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,21 +4,25 @@ os:
  - linux
  - linux-ppc64le
 
+# NB: This is just the distro used for the container host
+dist: bionic
+services: docker
+
 cache: ccache
 
 env:
-    matrix:
-    - RUN_ON_CONTAINER=ubuntu-18.04
-    - RUN_ON_CONTAINER=ubuntu-20.04
-    - RUN_ON_CONTAINER=ubuntu-latest
-    - RUN_ON_CONTAINER=centos7
-    - RUN_ON_CONTAINER=fedora32
-    - RUN_ON_CONTAINER=fedora-rawhide
-    - RUN_ON_CONTAINER=debian-stretch
-    - RUN_ON_CONTAINER=debian-unstable
-    - RUN_ON_CONTAINER=docs
-
-matrix:
+    jobs:
+      - RUN_ON_CONTAINER=ubuntu-18.04
+      - RUN_ON_CONTAINER=ubuntu-20.04
+      - RUN_ON_CONTAINER=ubuntu-latest
+      - RUN_ON_CONTAINER=centos7
+      - RUN_ON_CONTAINER=fedora32
+      - RUN_ON_CONTAINER=fedora-rawhide
+      - RUN_ON_CONTAINER=debian-stretch
+      - RUN_ON_CONTAINER=debian-unstable
+      - RUN_ON_CONTAINER=docs
+
+jobs:
   allow_failures:
     - env: RUN_ON_CONTAINER=fedora-rawhide
     - env: RUN_ON_CONTAINER=debian-unstable
@@ -28,12 +32,6 @@ matrix:
     - os: linux-ppc64le
       env: RUN_ON_CONTAINER=docs
 
-
-sudo: required
-services: docker
-
-dist: trusty
-
 script:
     - docker build --pull -t ${RUN_ON_CONTAINER} -f opal-ci/Dockerfile-${RUN_ON_CONTAINER} . &&
       docker run --volume $HOME/.ccache:/root/.ccache --volume `pwd`:/build --rm -t $RUN_ON_CONTAINER bash -c "./opal-ci/build-${RUN_ON_CONTAINER}.sh";
@@ -51,8 +49,8 @@ addons:
 
 deploy:
   provider: pages
-  skip-cleanup: true
-  github-token: $GITHUB_TOKEN # set in travis-ci.org dashboard, marked secure
+  skip_cleanup: true
+  github_token: $GITHUB_TOKEN # set in travis-ci.org dashboard, marked secure
   local_dir: "doc/_build/ghpages"
   on:
     branch: master
-- 
2.26.2