From 47d3ddcb320675911ec4e55eb5823ebbceeb3687 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 13:23:50 +0000 Subject: Revert "Strip out debian metadata" This reverts commit 4d9ca84e57dad6746eb0882b91171ccd69298807. --- debian/rules | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 debian/rules (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..99a63c4 --- /dev/null +++ b/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f +# +# Use CDBS, so we can build for etch (ugh) +# + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/makefile.mk + -- cgit v1.2.1 From bcde8969e4ef5acba8ee1fe3a284c9757c73678d Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 15:36:33 +0000 Subject: Added haml-contrib for the textile filter; updated debian packaging a little --- debian/rules | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 99a63c4..f938869 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,5 @@ #!/usr/bin/make -f -# -# Use CDBS, so we can build for etch (ugh) -# -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/makefile.mk +%: + dh $@ --buildsystem=ruby --with ruby --with systemd -- cgit v1.2.1 From 40533e34cca72fee719a9d84f6e07b13ca893b6e Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Mon, 20 Mar 2017 22:41:48 +0000 Subject: Updated packaging .. still need a datamapper package --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index f938869..5289f9d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f %: - dh $@ --buildsystem=ruby --with ruby --with systemd + dh $@ --with systemd -- 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(+) (limited to 'debian/rules') 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 From 929c689f3381ac71d80b2dda55a0ddf602efafe2 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 14:16:29 +0100 Subject: Reconfigure server package to deploy to /srv/mauvealert --- debian/rules | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 5289f9d..04033e8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,17 @@ #!/usr/bin/make -f +# Ugh +export GEM_HOME := $(shell pwd)/vendor/bundle +export PATH := ${GEM_HOME}/bin:${PATH} + %: - dh $@ --with systemd + dh $@ --with-systemd + +override_dh_auto_build: + gem install bundler + bundler install --deployment --without="test development" --jobs=4 + +override_dh_clean: + dh_clean + $(RM) -r vendor/ -- cgit v1.2.1 From 0db800af457e5c3839156813bcbd8f5d3560b3a9 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Thu, 22 Jun 2017 16:31:36 +0100 Subject: Don't install bundler with gem; run make --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 9449283..c43ea38 100755 --- a/debian/rules +++ b/debian/rules @@ -8,14 +8,13 @@ export PATH := ${GEM_HOME}/bin:${PATH} dh $@ --with-systemd override_dh_auto_build: - gem install bundler bundler install --deployment --without="test development" --jobs=4 + make override_dh_clean: dh_clean $(RM) -r vendor/ - override_dh_auto_test: echo "NOP" -- cgit v1.2.1 From 89f7cb1762a865d72827a024559018efc247e185 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Tue, 1 Aug 2017 11:13:37 +0100 Subject: Removed more cruft. Updated debian/rules to use the Makefile. Updated bundle --- debian/rules | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index c43ea38..4097e2e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,20 +1,13 @@ #!/usr/bin/make -f - -# Ugh -export GEM_HOME := $(shell pwd)/vendor/bundle -export PATH := ${GEM_HOME}/bin:${PATH} + +export BUNDLER_FLAGS=--deployment --without='test development' --jobs=4 %: dh $@ --with-systemd -override_dh_auto_build: - bundler install --deployment --without="test development" --jobs=4 - make - -override_dh_clean: - dh_clean - $(RM) -r vendor/ - +# +# We test separately in Gitlab. +# override_dh_auto_test: echo "NOP" -- cgit v1.2.1