aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick J Cherry <patrick@bytemark.co.uk>2017-03-20 16:04:07 +0000
committerPatrick J Cherry <patrick@bytemark.co.uk>2017-03-20 16:04:07 +0000
commit1a2ad3bfd7a08b578f675f8a99ff78a5e8d6eae7 (patch)
tree3b8b883521f6c20b6cdff2da310deba3d7b916fd
parent28e99f9de3f42a566011985c22e51c907ee27681 (diff)
Removed libxml2/libxslt-dev from gitlab-ci; moved dev gems into a development group.
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock67
3 files changed, 69 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 119759c..a153ec7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ test:jessie: &test
variables:
DISTRO: jessie
before_script:
- - apt-get install libxml2-dev libxslt1-dev libpq-dev postgresql-server-dev-9.4 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-get install libpq-dev postgresql-server-dev-9.4 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
script:
- bundle install -j $(nproc) --path vendor/bundle --without development,test
- bundle exec rake test
@@ -19,7 +19,7 @@ test:stretch:
variables:
DISTRO: stretch
before_script:
- - apt-get install libxml2-dev libxslt1-dev libpq-dev postgresql-server-dev-9.6 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-get install libpq-dev postgresql-server-dev-9.6 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
package:jessie: &package
image: $CI_REGISTRY/docker-images/layers:$DISTRO-deb
diff --git a/Gemfile b/Gemfile
index 6343365..62192c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,6 @@ gem "dm-validations"
group :devlopment do
gem "log4r"
gem "ipaddress"
- gem "ruby_protobuf"
gem "json"
gem "sanitize"
gem "rmail"
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ec1459..ad8b5fd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,16 @@
GEM
remote: https://rubygems.org/
specs:
+ RedCloth (4.3.2)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
bcrypt (3.1.11)
bcrypt-ruby (3.1.5)
bcrypt (>= 3.1.3)
+ crack (0.4.3)
+ safe_yaml (~> 1.0.0)
+ crass (1.0.2)
+ daemons (1.2.4)
data_objects (0.10.17)
addressable (~> 2.1)
datamapper (1.2.0)
@@ -60,24 +65,66 @@ GEM
do_sqlite3 (0.10.17)
data_objects (= 0.10.17)
docile (1.1.5)
+ eventmachine (1.2.3)
fastercsv (1.5.5)
+ haml (4.0.7)
+ tilt
+ haml-contrib (1.0.0.1)
+ haml (>= 3.2.0.alpha.13)
+ hashdiff (0.3.2)
+ ipaddress (0.8.3)
json (1.8.6)
json_pure (1.8.6)
+ locale (2.1.2)
+ log4r (1.1.10)
+ mini_portile2 (2.1.0)
multi_json (1.12.1)
+ nokogiri (1.7.1)
+ mini_portile2 (~> 2.1.0)
+ nokogumbo (1.4.10)
+ nokogiri
public_suffix (2.0.5)
+ rack (1.6.5)
+ rack-flash3 (1.0.5)
+ rack
+ rack-protection (1.5.3)
+ rack
+ rack-test (0.6.3)
+ rack (>= 1.0)
+ rmail (1.1.2)
ruby_protobuf (0.4.11)
+ safe_yaml (1.0.4)
+ sanitize (4.4.0)
+ crass (~> 1.0.2)
+ nokogiri (>= 1.4.4)
+ nokogumbo (~> 1.4.1)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
+ sinatra (1.4.8)
+ rack (~> 1.5)
+ rack-protection (~> 1.4)
+ tilt (>= 1.3, < 3)
stringex (1.5.1)
+ thin (1.7.0)
+ daemons (~> 1.0, >= 1.0.9)
+ eventmachine (~> 1.0, >= 1.0.4)
+ rack (>= 1, < 3)
+ tilt (2.0.7)
+ timecop (0.8.1)
uuidtools (2.1.5)
+ webmock (2.3.2)
+ addressable (>= 2.3.6)
+ crack (>= 0.3.2)
+ hashdiff
PLATFORMS
ruby
DEPENDENCIES
+ RedCloth
bcrypt-ruby (= 3.1.5)
datamapper
dm-aggregates
@@ -88,5 +135,25 @@ DEPENDENCIES
dm-transactions
dm-types
dm-validations
+ haml
+ haml-contrib
+ ipaddress
+ json
+ locale
+ log4r
+ rack
+ rack-flash3
+ rack-protection
+ rack-test
+ rmail
ruby_protobuf (= 0.4.11)
+ sanitize
simplecov
+ sinatra
+ thin
+ tilt
+ timecop
+ webmock
+
+BUNDLED WITH
+ 1.13.6