Skip to content

Commit

Permalink
circleci: update to fedora 30
Browse files Browse the repository at this point in the history
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 c425780 for details.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  • Loading branch information
whot authored and FFY00 committed May 24, 2019
1 parent c425780 commit dbe98ed
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions circle.yml
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -184,23 +184,23 @@ 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:
- image: ubuntu:19.04
doc_build:
<<: *doc_build
docker:
- image: fedora:28
- image: fedora:30
doc_deploy:
<<: *docs_deploy
docker:
- image: fedora:28
- image: fedora:30


workflows:
Expand Down

0 comments on commit dbe98ed

Please sign in to comment.