aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wilmott <p@p8952.info>2015-08-16 16:28:20 +0100
committerPeter Wilmott <p@p8952.info>2015-08-16 16:28:20 +0100
commitabdec820b223e899e5ebb6d6036a18635239cd8f (patch)
treec4c54bd05e5421350b86c9321eab9f54b6ae24b7
parentOops (diff)
downloadruby-tinderbox-abdec820b223e899e5ebb6d6036a18635239cd8f.tar.gz
ruby-tinderbox-abdec820b223e899e5ebb6d6036a18635239cd8f.tar.bz2
ruby-tinderbox-abdec820b223e899e5ebb6d6036a18635239cd8f.zip
Use Travis CI's container-based infrastructure for tests
-rw-r--r--.travis.yml17
-rw-r--r--web/lib/packages.rb2
2 files changed, 7 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml
index 13f6d87..5cd3e00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
language: ruby
rvm:
- 2.2
@@ -8,20 +9,14 @@ env:
- DATABASE_URL='postgres://postgres@localhost/travis_ci_test'
before_script:
- psql -c 'create database travis_ci_test;' -U postgres
+addons:
+ apt:
+ packages:
+ - pylint
+ - shellcheck
install:
- cd web/
- bundle install
- - wget http://ftp.debian.org/debian/pool/main/s/shellcheck/shellcheck_0.3.7-1_amd64.deb
- - sudo dpkg -i shellcheck_0.3.7-1_amd64.deb
- - sudo apt-get -y update
- - sudo apt-get -y install python-software-properties
- - sudo add-apt-repository -y ppa:fkrull/deadsnakes
- - sudo apt-get -y update
- - sudo apt-get -y install python3.3
- - wget https://bootstrap.pypa.io/get-pip.py
- - sudo python3.3 get-pip.py
- - rm get-pip.py
- - sudo pip install pylint
script:
- bundle exec rake db:migrate
- bundle exec rake
diff --git a/web/lib/packages.rb b/web/lib/packages.rb
index f8bc4a6..6e3f0b5 100644
--- a/web/lib/packages.rb
+++ b/web/lib/packages.rb
@@ -38,7 +38,7 @@ def update_packages(ci_image)
r21_target: r21_target,
r22_target: r22_target,
next_target: next_target,
- gem_version: gem_version,
+ gem_version: gem_version
)
deps = line.split(' ').drop(11).join.gsub(';', ' ')
package.update(dependencies: deps)