diff options
| author | Benjamin Neff <benjamin@coding4coffee.ch> | 2017-10-29 19:38:58 +0300 |
|---|---|---|
| committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2017-11-01 02:46:36 +0300 |
| commit | 7c4648030f4256c8e405db470c0f3d77cd225add (patch) | |
| tree | e5c5cdf9f15682ba1d430380adb8902e0241b344 | |
| parent | 4e267bb1efdd0a295c3b6909f74cf9c60b6856a4 (diff) | |
Run rake directly without xvfb on travis
closes #7654
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Changelog.md | 4 | ||||
| -rwxr-xr-x | script/ci/build.sh | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 7fc3b0aeb..6df40becc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_install: - tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs - export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH -script: "./script/ci/build.sh" +script: "bin/rake --trace ci:travis:${BUILD_TYPE}" notifications: irc: diff --git a/Changelog.md b/Changelog.md index 9ebd9e557..02de9c2c4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +# 0.7.1.1 + +Fixes an issue with installing and running diaspora\* with today released bundler v1.16.0. + # 0.7.1.0 ## Ensure account deletions are run diff --git a/script/ci/build.sh b/script/ci/build.sh deleted file mode 100755 index 376917c83..000000000 --- a/script/ci/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -command="bundle exec rake --trace ci:travis:${BUILD_TYPE}" - -exec xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1280x1024x8" $command |