From 9e03581ab991974be02d58532dffcf5e1df667ae Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Tue, 13 Jun 2017 09:04:40 +0300 Subject: Updated to avoid Ruby 1.8-specific file. Rather than referring to `/usr/lib/ruby/1.8/setup.rb` I've updated to use `/usr/lib/ruby/vendor_ruby/setup.rb` (which comes from the `ruby-setup` package. --- Makefile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 2254496..3f38e20 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ clean: $(RM) -r tmp $(RM) -r OpenBSD $(RM) setup.rb - + distclean: clean if [ -e ./setup.rb ] ; then ruby ./setup.rb distclean ; fi @@ -35,15 +35,15 @@ distclean: clean test: setup.rb ruby ./setup.rb test -setup.rb: /usr/lib/ruby/1.8/setup.rb - ln -sf /usr/lib/ruby/1.8/setup.rb . +setup.rb: /usr/lib/ruby/vendor_ruby/setup.rb + ln -sf /usr/lib/ruby/vendor_ruby/setup.rb . OpenBSD: OpenBSD/sha256.asc OpenBSD/sha256: OpenBSD/ruby-mauvealert.tar.gz OpenBSD/ruby-protobuf.tar.gz # # rejig sha256sum to openbsd sha256 - # + # $(RM) OpenBSD/sha256 cd OpenBSD && sha256sum * | sed -e 's/\([^ ]\+\) \(.*\)$$/SHA256 (\2) = \1/' > sha256 @@ -65,12 +65,11 @@ OpenBSD/ruby-protobuf.tar.gz: mkdir -p tmp/ruby-protobuf-source git clone https://github.com/macks/ruby-protobuf.git tmp/ruby-protobuf-source cd tmp/ruby-protobuf-source && git checkout -b v0.4.5 - ln -sf /usr/lib/ruby/1.8/setup.rb tmp/ruby-protobuf-source/ - cd tmp/ruby-protobuf-source && ruby ./setup.rb config ${OPENBSD_SETUP_FLAGS} + ln -sf /usr/lib/ruby/vendor_ruby/setup.rb tmp/ruby-protobuf-source/ + cd tmp/ruby-protobuf-source && ruby ./setup.rb config ${OPENBSD_SETUP_FLAGS} cd tmp/ruby-protobuf-source && ruby ./setup.rb setup cd tmp/ruby-protobuf-source && ruby ./setup.rb install --prefix=../ruby-protobuf mkdir -p OpenBSD tar -C tmp/ruby-protobuf -czvf $@ . .PHONY: all clean openbsd_tarball test distclean OpenBSD - -- cgit v1.2.1 From 1ac1143405540347fb5e983286ae2b08568445b6 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Tue, 13 Jun 2017 09:10:02 +0300 Subject: Install ruby-setup --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f6ce09..2dd578b 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-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-setup 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" -- cgit v1.2.1 From 03f58f11c741e036234d30c2ad6e0bcdad3ee769 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Tue, 13 Jun 2017 09:13:42 +0300 Subject: Final attempt to handle `setup.rb`. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3f38e20..bbf7175 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ distclean: clean test: setup.rb ruby ./setup.rb test -setup.rb: /usr/lib/ruby/vendor_ruby/setup.rb +setup.rb: ln -sf /usr/lib/ruby/vendor_ruby/setup.rb . OpenBSD: OpenBSD/sha256.asc -- cgit v1.2.1 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(-) 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.1 From c0622c31b768c55f471f86b60031c3128543a319 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Tue, 13 Jun 2017 09:20:34 +0300 Subject: Revert all previous changes --- Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index bbf7175..2254496 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ clean: $(RM) -r tmp $(RM) -r OpenBSD $(RM) setup.rb - + distclean: clean if [ -e ./setup.rb ] ; then ruby ./setup.rb distclean ; fi @@ -35,15 +35,15 @@ distclean: clean test: setup.rb ruby ./setup.rb test -setup.rb: - ln -sf /usr/lib/ruby/vendor_ruby/setup.rb . +setup.rb: /usr/lib/ruby/1.8/setup.rb + ln -sf /usr/lib/ruby/1.8/setup.rb . OpenBSD: OpenBSD/sha256.asc OpenBSD/sha256: OpenBSD/ruby-mauvealert.tar.gz OpenBSD/ruby-protobuf.tar.gz # # rejig sha256sum to openbsd sha256 - # + # $(RM) OpenBSD/sha256 cd OpenBSD && sha256sum * | sed -e 's/\([^ ]\+\) \(.*\)$$/SHA256 (\2) = \1/' > sha256 @@ -65,11 +65,12 @@ OpenBSD/ruby-protobuf.tar.gz: mkdir -p tmp/ruby-protobuf-source git clone https://github.com/macks/ruby-protobuf.git tmp/ruby-protobuf-source cd tmp/ruby-protobuf-source && git checkout -b v0.4.5 - ln -sf /usr/lib/ruby/vendor_ruby/setup.rb tmp/ruby-protobuf-source/ - cd tmp/ruby-protobuf-source && ruby ./setup.rb config ${OPENBSD_SETUP_FLAGS} + ln -sf /usr/lib/ruby/1.8/setup.rb tmp/ruby-protobuf-source/ + cd tmp/ruby-protobuf-source && ruby ./setup.rb config ${OPENBSD_SETUP_FLAGS} cd tmp/ruby-protobuf-source && ruby ./setup.rb setup cd tmp/ruby-protobuf-source && ruby ./setup.rb install --prefix=../ruby-protobuf mkdir -p OpenBSD tar -C tmp/ruby-protobuf -czvf $@ . .PHONY: all clean openbsd_tarball test distclean OpenBSD + -- cgit v1.2.1 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(-) 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.1 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(+) 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.1