Skip to content

Commit

Permalink
Add d-bus support to CI image, start daemon when testing.
Browse files Browse the repository at this point in the history
  • Loading branch information
TallFurryMan committed Dec 18, 2021
1 parent e32f206 commit b607d6e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ stages:
- test
- test-unstable

image: tallfurryman/kstars-ci:0.8
image: tallfurryman/kstars-ci:0.9

variables:
CCACHE_BASEDIR: "$CI_PROJECT_DIR"
Expand Down Expand Up @@ -65,6 +65,7 @@ build-and-test-stable:
- *build_recipe
script:
- rm -rf Testing
- dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address
- xvfb-run ctest -T test -L stable --output-on-failure
after_script:
- pwd
Expand All @@ -88,6 +89,7 @@ build-and-test-unstable:
- *build_recipe
script:
- rm -rf Testing
- dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address
- xvfb-run ctest -T test -LE stable --output-on-failure --no-compress-output
after_script:
- pwd
Expand Down
4 changes: 4 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,9 @@ ADD http://broiler.astrometry.net/~dstn/4200/index-4208.fits /root/.local/share/
ADD http://broiler.astrometry.net/~dstn/4200/index-4209.fits /root/.local/share/kstars/astrometry/
ADD http://broiler.astrometry.net/~dstn/4200/index-4210.fits /root/.local/share/kstars/astrometry/

# From https://invent.kde.org/sysadmin/ci-tooling/-/blob/master/system-images/suse-qt515/Dockerfile
RUN apt update && apt -y install dbus
RUN dbus-uuidgen > /etc/machine-id

CMD /bin/bash

0 comments on commit b607d6e

Please sign in to comment.