From dbe98ed5b9fd56761adc36722803bfb5e80cab6b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 24 May 2019 09:32:21 +1000 Subject: [PATCH] circleci: update to fedora 30 And install dbus-daemon manually, until we figure out how to correctly start the new dbus-broker this will at least help us pass the tests. And disable nss-systemd so we don't suffer from timeouts as dbus-daemon waits for that to time out, see c4257802206186b891bea8d055c14b03772a64bf for details. Signed-off-by: Peter Hutterer --- circle.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/circle.yml b/circle.yml index 3c6af327..c3aeec69 100644 --- a/circle.yml +++ b/circle.yml @@ -66,7 +66,7 @@ fedora_prep_cache: &fedora_prep_cache steps: - run: name: Initializing Fedora dnf cache - command: dnf install -y --downloadonly libsolv tree git gcc gcc-c++ meson check-devel libudev-devel libevdev-devel valgrind python3-gobject python3-evdev glib2-devel python3-lxml libunistring-devel + command: dnf install -y --downloadonly libsolv tree git gcc gcc-c++ meson check-devel libudev-devel libevdev-devel valgrind python3-gobject python3-evdev glib2-devel python3-lxml libunistring-devel dbus-daemon - persist_to_workspace: root: /var/cache/ paths: @@ -82,8 +82,8 @@ fedora_install: &fedora_install command: | echo keepcache=1 >> /etc/dnf/dnf.conf dnf upgrade -y libsolv - dnf install -y tree git gcc gcc-c++ meson check-devel libudev-devel libevdev-devel valgrind python3-gobject python3-evdev glib2-devel python3-lxml python3-devel swig libunistring-devel - + dnf install -y tree git gcc gcc-c++ meson check-devel libudev-devel libevdev-devel valgrind python3-gobject python3-evdev glib2-devel python3-lxml python3-devel swig libunistring-devel dbus-daemon + sed -i 's/systemd//' /etc/nsswitch.conf fedora_settings: &fedora_settings <<: *default_settings @@ -184,11 +184,11 @@ jobs: fedora_cache: <<: *fedora_prep_cache docker: - - image: fedora:28 + - image: fedora:30 fedora_latest: <<: *fedora_settings docker: - - image: fedora:28 + - image: fedora:30 ubuntu_19_04: <<: *ubuntu_settings docker: @@ -196,11 +196,11 @@ jobs: doc_build: <<: *doc_build docker: - - image: fedora:28 + - image: fedora:30 doc_deploy: <<: *docs_deploy docker: - - image: fedora:28 + - image: fedora:30 workflows: