From d9fa2ee01af71e3d2c867dfca52e9f6286b11988 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Tue, 13 Jun 2017 09:16:50 +0300 Subject: Added build-dep on ruby-setup --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 70baca0..17ed090 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Maintainer: Matthew Bloch Uploaders: Patrick J Cherry Section: ruby Priority: optional -Build-Depends: ruby | ruby-interpreter, debhelper, rdoc, txt2man, dh-systemd, bundler +Build-Depends: ruby | ruby-interpreter, ruby-setup, debhelper, rdoc, txt2man, dh-systemd, bundler Standards-Version: 3.9.1 Package: mauvealert-server -- cgit v1.2.3 From 2eea70308258eb29b8806809e546108878e7122a Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Tue, 13 Jun 2017 09:20:48 +0300 Subject: Revert previous changes with 'ruby-setup'. --- .gitlab-ci.yml | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') 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 Uploaders: Patrick J Cherry 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 -- cgit v1.2.3 From 72e9937cbf43dff08921c2adf72b3bb6eb1837ab Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Tue, 13 Jun 2017 09:21:58 +0300 Subject: Disable `make test`. This might seem controversial, but the pipeline for our package(s) already runs a distinct testing-step. So in practice this should be safe, and should avoid the problems I had with the Makefile referring to `ruby/1.8/setup.rb` --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 5289f9d..1db7492 100755 --- a/debian/rules +++ b/debian/rules @@ -3,3 +3,7 @@ %: dh $@ --with systemd + +override_dh_auto_test: + echo "NOP" + -- cgit v1.2.3