CI: Use Ubuntu 17.04 for DBus

manuels · May 14, 2017 · 23597f0 · 23597f0
1 parent bd84ec3
commit 23597f0
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,16 +21,16 @@ matrix:
   # don't need
   include:
     # Linux
-    - env: TARGET=i686-unknown-linux-gnu
+#    - env: TARGET=i686-unknown-linux-gnu
     - env: TARGET=i686-unknown-linux-musl
     - env: TARGET=x86_64-unknown-linux-gnu
     - env: TARGET=x86_64-unknown-linux-musl
 
     # OSX
-    - env: TARGET=i686-apple-darwin
-      os: osx
-    - env: TARGET=x86_64-apple-darwin
-      os: osx
+#    - env: TARGET=i686-apple-darwin
+#      os: osx
+#    - env: TARGET=x86_64-apple-darwin
+#      os: osx
 
     # *BSD
 #    - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1
@@ -52,9 +52,9 @@ matrix:
     # Testing other channels
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: nightly
-    - env: TARGET=x86_64-apple-darwin
-      os: osx
-      rust: nightly
+#    - env: TARGET=x86_64-apple-darwin
+#      os: osx
+#      rust: nightly
 
 before_install: set -e
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## [0.5.3] 2017-05-14
+### Fixed
+- Better debug output
+- Use dbus v1.10
+
 ## [0.5.2] 2017-05-11
 ### Fixed
 - Fix typo in supernode

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bulletinboard"
-version = "0.4.4"
+version = "0.5.3"
 authors = ["Manuel Schölling <manuel.schoelling@gmx.de>"]
 description = "A general-purpose DHT"
 homepage = "https://github.com/manuels/bulletinboard-dht"

diff --git a/README.md b/README.md
@@ -1,6 +1,8 @@
 BulletinBoard DHT
 =================
 
+[![Build Status](https://travis-ci.org/manuels/bulletinboard-dht.svg?branch=master)](https://travis-ci.org/manuels/bulletinboard-dht)
+
 [https://github.com/manuels/bulletinboard-dht](https://github.com/manuels/bulletinboard-dht)
 
 Introduction
@@ -29,18 +31,18 @@ Installation
 1) **Download**
 
          # Debian/Ubuntu
-         wget 'https://github.com/manuels/bulletinboard-dht/releases/download/v0.5.0/bulletinboard_0.5.0_amd64.deb'
+         wget 'https://github.com/manuels/bulletinboard-dht/releases/download/v0.5.3/bulletinboard_0.5.3_amd64.deb'
 
          # Fedora
-         wget 'https://github.com/manuels/bulletinboard-dht/releases/download/v0.5.0/bulletinboard-0.5.0-1.x86_64.rpm'
+         wget 'https://github.com/manuels/bulletinboard-dht/releases/download/v0.5.3/bulletinboard-0.5.3-1.x86_64.rpm'
 
 2) **Install bulletinboard**
 
          # Debian/Ubuntu
-         sudo dpkg -i bulletinboard_0.5.0_amd64.deb
+         sudo dpkg -i bulletinboard_0.5.3_amd64.deb
 
          # Fedora
-         sudo rpm -ivh bulletinboard-0.5.0.x86_64.rpm
+         sudo rpm -ivh bulletinboard-0.5.3.x86_64.rpm
 
 Usage
 -----

diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
@@ -51,16 +51,18 @@ main() {
     ~/.rbenv/bin/rbenv rehash
     which gem
 
-    gem install --no-ri --no-rdoc ffi
-    gem install --no-ri --no-rdoc fpm
-    fpm -s dir -t deb -n $CRATE_NAME -v `echo $TRAVIS_TAG | tr -d v` \
-        $src/org.manuel.BulletinBoard.service=/usr/share/dbus-1/services/ \
-        $src/target/$TARGET/release/bulletinboard=/usr/bin/
-    fpm -s dir -t rpm -n $CRATE_NAME -v `echo $TRAVIS_TAG | tr -d v` \
-        $src/org.manuel.BulletinBoard.service=/usr/share/dbus-1/services/ \
-        $src/target/$TARGET/release/bulletinboard=/usr/bin/
-    cp *deb $src
-    cp *rpm $src
+    if [ $NAME = with_dbus_service ]; then
+        gem install --no-ri --no-rdoc ffi
+        gem install --no-ri --no-rdoc fpm
+        fpm -s dir -t deb -n $CRATE_NAME -v `echo $TRAVIS_TAG | tr -d v` \
+            $src/org.manuel.BulletinBoard.service=/usr/share/dbus-1/services/ \
+            $src/target/$TARGET/release/bulletinboard=/usr/bin/
+        fpm -s dir -t rpm -n $CRATE_NAME -v `echo $TRAVIS_TAG | tr -d v` \
+            $src/org.manuel.BulletinBoard.service=/usr/share/dbus-1/services/ \
+            $src/target/$TARGET/release/bulletinboard=/usr/bin/
+        cp *deb $src
+        cp *rpm $src
+    fi
 
     cd $src
 

diff --git a/ci/install.sh b/ci/install.sh
@@ -8,8 +8,27 @@ main() {
     if [ $TRAVIS_OS_NAME = linux ]; then
         target=x86_64-unknown-linux-gnu
         sort=sort
+        echo 'APT::Default-Release "trusty";' | sudo tee /etc/apt/apt.conf.d/01ubuntu
+        echo 'deb http://archive.ubuntu.com/ubuntu xenial main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list
+        echo <<EOF | sudo tee -a /etc/apt/preferences
+Package: libdbus-1-dev
+Pin: release n=trusty
+Pin-Priority: -10
+
+Package: libdbus-1-dev
+Pin: release n=xenial
+Pin-Priority: 900
+
+Package: dbus-x11
+Pin: release n=trusty
+Pin-Priority: -10
+
+Package: dbus-x11
+Pin: release n=xenial
+Pin-Priority: 900
+EOF
         sudo apt-get update
-        sudo apt-get install -y libdbus-1-dev dbus-x11
+        sudo apt-get install -t xenial -y binutils libdbus-1-dev dbus-x11
     else
         target=x86_64-apple-darwin
         sort=gsort  # for `sort --sort-version`, from brew's coreutils.