ci: bump Ubuntu to 20.04

This also removes the manual addition of the universe repository, since it's already enabled in the circleci image.
Because of this, software-properties-common doesn't need to be installed anymore, and libnss-systemd isn't going to be installed (see c425780220).
However, DEBIAN_FRONTEND=noninteractive needs to be set, else the image will loop while trying to configure tzdata (aka the timezome).

Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
This commit is contained in:
Stephan Lachnit
2020-06-07 20:18:10 +02:00
committed by Peter Hutterer
parent 9fc6d12486
commit b88be0add0

View File

@@ -156,10 +156,7 @@ ubuntu_settings: &ubuntu_settings
- run:
name: Install prerequisites
command: |
apt-get update
apt-get install -y software-properties-common
apt-get remove -y libnss-systemd
add-apt-repository universe
export DEBIAN_FRONTEND=noninteractive
apt-get update
apt-get install -y git ${UBUNTU_DEP_BUILD} ${UBUNTU_DEP_TEST}
- checkout
@@ -242,10 +239,10 @@ jobs:
<<: *arch_settings
docker:
- image: archlinux
ubuntu_19_10:
ubuntu_20_04:
<<: *ubuntu_settings
docker:
- image: ubuntu:19.10
- image: ubuntu:20.04
doc_build:
<<: *doc_build
docker:
@@ -260,7 +257,7 @@ workflows:
version: 2
compile_and_test:
jobs:
- ubuntu_19_10
- ubuntu_20_04
- arch
- fedora_31
- doc_build