aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2017-06-13 09:20:48 +0300
committerSteve Kemp <steve@steve.org.uk>2017-06-13 09:20:48 +0300
commit2eea70308258eb29b8806809e546108878e7122a (patch)
treefe0ad4c68105a43ed0582b00c8332fc7b1d7b9e3
parentc0622c31b768c55f471f86b60031c3128543a319 (diff)
Revert previous changes with 'ruby-setup'.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--debian/control2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dd578b..4f6ce09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ test:jessie: &test
before_script:
- apt install libpq-dev postgresql-server-dev-9.4
script:
- - apt install libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-setup ruby-timecop ruby-test-unit
+ - apt install libsqlite3-dev rake ruby-log4r ruby-ipaddress ruby-json ruby-sanitize ruby-rubymail thin ruby-haml ruby-haml-contrib ruby-redcloth ruby-rack ruby-rack-protection ruby-rack-flash3 ruby-tilt ruby-sinatra ruby-locale ruby-rack-test ruby-webmock ruby-timecop ruby-test-unit
- bundle install -j $(nproc) --path vendor/bundle --without development
- "POSTGRES_URL=postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB bundle exec rake test"
diff --git a/debian/control b/debian/control
index 17ed090..70baca0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Matthew Bloch <matthew@bytemark.co.uk>
Uploaders: Patrick J Cherry <patrick@bytemark.co.uk>
Section: ruby
Priority: optional
-Build-Depends: ruby | ruby-interpreter, ruby-setup, debhelper, rdoc, txt2man, dh-systemd, bundler
+Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, bundler
Standards-Version: 3.9.1
Package: mauvealert-server