CI/AppVeyor: fix artifacts; CI/docker: add missing dbus

trikset · Aug 19, 2018 · 945a75a · 945a75a
1 parent 5f563a7
commit 945a75a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,14 +7,13 @@ environment:
     PYTHON_LIB: C:\Python27\libs
     PROJECT_FILE: trikRuntime
   matrix:
-#    - PROJECT_FILE: qreal
       - MINGW: C:\Qt\Tools\mingw492_32
         QTDIR: C:\Qt\5.6.3\mingw49_32
       - MINGW: C:\Qt\Tools\mingw530_32
         QTDIR: C:\Qt\5.11.1\mingw53_32
 
 configuration:
-#  - debug
+# - debug
   - release
 
 before_build:
@@ -26,5 +25,5 @@ build_script:
   - mingw32-make -j2
 
 artifacts:
- - path: bin\$(configuration)
-   name: trik-runtime-$(configuration)-win32
+ - path: bin\x86-$(configuration)
+   name: trikRuntime-win32-$(configuration)
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -13,7 +13,8 @@ RUN apt install -y rsync build-essential g++-4.8 pkg-config libboost-system-dev
         xterm python2.7-dev git-core ccache
 
 #for TRIK Studio build
-RUN apt install -y libusb-1.0-0-dev
+RUN apt install -y libusb-1.0-0-dev dbus
+RUN [ -r /etc/machine-id ] || { dbus-uuidgen | tee /etc/machine-id ; }
 
 #RUN apt-get install -y qdbus qmlscene qt5-qmake \
 #        qtbase5-dev-tools qtchooser qtdeclarative5-dev libqt5svg5-dev \