diff options
| author | Thomas Huth <thuth@redhat.com> | 2022-02-25 17:20:17 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2022-02-28 16:42:35 +0000 |
| commit | da420d3d1dda7b10e1154b149d3705c4ab91be30 (patch) | |
| tree | 2d52438be6f60b61f01091412c3cbc7d1b5f1c8c | |
| parent | f8a4c6d728bc2427c5455379482f40ba8706a96f (diff) | |
| download | qemu-da420d3d1dda7b10e1154b149d3705c4ab91be30.zip qemu-da420d3d1dda7b10e1154b149d3705c4ab91be30.tar.gz qemu-da420d3d1dda7b10e1154b149d3705c4ab91be30.tar.bz2 | |
travis.yml: Update the s390x jobs to Ubuntu Focal
QEMU will soon drop the support for Ubuntu 18.04, so let's update
the Travis jobs that were still using this version to 20.04 instead.
While we're at it, also remove an obsolete comment about Ubuntu
Xenial being the default for our Travis jobs.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220221153423.1028465-1-thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220225172021.3493923-15-alex.bennee@linaro.org>
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 41010eb..c3c8048 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,3 @@ -# The current Travis default is a VM based 16.04 Xenial on GCE -# Additional builds with specific requirements for a full VM need to -# be added as additional matrix: entries later on os: linux dist: focal language: c @@ -190,7 +187,7 @@ jobs: - name: "[s390x] GCC check-tcg" arch: s390x - dist: bionic + dist: focal addons: apt_packages: - libaio-dev @@ -233,7 +230,7 @@ jobs: - name: "[s390x] GCC (other-softmmu)" arch: s390x - dist: bionic + dist: focal addons: apt_packages: - libaio-dev @@ -263,10 +260,11 @@ jobs: - name: "[s390x] GCC (user)" arch: s390x - dist: bionic + dist: focal addons: apt_packages: - libgcrypt20-dev + - libglib2.0-dev - libgnutls28-dev - ninja-build env: @@ -274,7 +272,7 @@ jobs: - name: "[s390x] Clang (disable-tcg)" arch: s390x - dist: bionic + dist: focal compiler: clang addons: apt_packages: |