mirror of
https://github.com/thoughtbot/capybara-webkit
synced 2023-03-27 23:22:28 -04:00
Clean up Travis before install script
Only install Qt 5 when building against Qt 5. Remove unnecessary explicit dependencies.
This commit is contained in:
parent
4d898b4536
commit
b5df0fa270
1 changed files with 2 additions and 4 deletions
|
@ -1,7 +1,7 @@
|
||||||
language: ruby
|
language: ruby
|
||||||
rvm:
|
rvm:
|
||||||
- 1.9.3
|
- 1.9.3
|
||||||
- 2.1.2
|
- 2.1
|
||||||
- jruby-19mode
|
- jruby-19mode
|
||||||
notifications:
|
notifications:
|
||||||
email: false
|
email: false
|
||||||
|
@ -22,7 +22,5 @@ gemfile:
|
||||||
- gemfiles/2.3.gemfile
|
- gemfiles/2.3.gemfile
|
||||||
- gemfiles/2.4.gemfile
|
- gemfiles/2.4.gemfile
|
||||||
before_install:
|
before_install:
|
||||||
- sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
|
- sh -c 'if [ -n "$QMAKE" ]; then sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa && sudo apt-get update && sudo apt-get install libqt5webkit5-dev qtdeclarative5-dev; fi'
|
||||||
- sudo apt-get update
|
|
||||||
- sudo apt-get install libqt5webkit5-dev qtdeclarative5-dev qtlocation5-dev qtsensors5-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev qt4-default
|
|
||||||
install: bundle
|
install: bundle
|
||||||
|
|
Loading…
Add table
Reference in a new issue