From 79475e8598932e948c8482d9ec0e155dc49f8a38 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Thu, 29 Oct 2015 01:45:18 -0700 Subject: [PATCH] Moved ci and gemfiles into test directory --- .travis.yml | 18 +++++++++--------- ci/before_install.sh | 15 --------------- gemfiles/activerecord31.gemfile | 7 ------- gemfiles/activerecord32.gemfile | 7 ------- gemfiles/activerecord40.gemfile | 8 -------- gemfiles/activerecord41.gemfile | 8 -------- gemfiles/mongoid2.gemfile | 7 ------- gemfiles/mongoid3.gemfile | 6 ------ gemfiles/mongoid4.gemfile | 7 ------- gemfiles/nobrainer.gemfile | 6 ------ test/ci/before_install.sh | 15 +++++++++++++++ test/gemfiles/activerecord31.gemfile | 7 +++++++ test/gemfiles/activerecord32.gemfile | 7 +++++++ test/gemfiles/activerecord40.gemfile | 8 ++++++++ test/gemfiles/activerecord41.gemfile | 8 ++++++++ test/gemfiles/mongoid2.gemfile | 7 +++++++ test/gemfiles/mongoid3.gemfile | 6 ++++++ test/gemfiles/mongoid4.gemfile | 7 +++++++ test/gemfiles/nobrainer.gemfile | 6 ++++++ 19 files changed, 80 insertions(+), 80 deletions(-) delete mode 100755 ci/before_install.sh delete mode 100644 gemfiles/activerecord31.gemfile delete mode 100644 gemfiles/activerecord32.gemfile delete mode 100644 gemfiles/activerecord40.gemfile delete mode 100644 gemfiles/activerecord41.gemfile delete mode 100644 gemfiles/mongoid2.gemfile delete mode 100644 gemfiles/mongoid3.gemfile delete mode 100644 gemfiles/mongoid4.gemfile delete mode 100644 gemfiles/nobrainer.gemfile create mode 100755 test/ci/before_install.sh create mode 100644 test/gemfiles/activerecord31.gemfile create mode 100644 test/gemfiles/activerecord32.gemfile create mode 100644 test/gemfiles/activerecord40.gemfile create mode 100644 test/gemfiles/activerecord41.gemfile create mode 100644 test/gemfiles/mongoid2.gemfile create mode 100644 test/gemfiles/mongoid3.gemfile create mode 100644 test/gemfiles/mongoid4.gemfile create mode 100644 test/gemfiles/nobrainer.gemfile diff --git a/.travis.yml b/.travis.yml index 0ea612a..01be9af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ services: - elasticsearch - mongodb before_install: - - ./ci/before_install.sh + - ./test/ci/before_install.sh script: bundle exec rake test before_script: - psql -c 'create database searchkick_test;' -U postgres @@ -14,14 +14,14 @@ notifications: on_failure: change gemfile: - Gemfile - - gemfiles/activerecord41.gemfile - - gemfiles/activerecord40.gemfile - - gemfiles/activerecord32.gemfile - - gemfiles/activerecord31.gemfile - - gemfiles/mongoid2.gemfile - - gemfiles/mongoid3.gemfile - - gemfiles/mongoid4.gemfile + - test/gemfiles/activerecord41.gemfile + - test/gemfiles/activerecord40.gemfile + - test/gemfiles/activerecord32.gemfile + - test/gemfiles/activerecord31.gemfile + - test/gemfiles/mongoid2.gemfile + - test/gemfiles/mongoid3.gemfile + - test/gemfiles/mongoid4.gemfile matrix: include: - - gemfile: gemfiles/nobrainer.gemfile + - gemfile: test/gemfiles/nobrainer.gemfile env: NOBRAINER=true diff --git a/ci/before_install.sh b/ci/before_install.sh deleted file mode 100755 index a3b9ff9..0000000 --- a/ci/before_install.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -sudo apt-get purge elasticsearch -wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.7.3.deb -sudo dpkg -i elasticsearch-1.7.3.deb -sudo service elasticsearch start - -if [ -n "$NOBRAINER" ]; then - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add - - sudo apt-get update -q - sudo apt-get install rethinkdb - sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf - sudo service rethinkdb restart -fi diff --git a/gemfiles/activerecord31.gemfile b/gemfiles/activerecord31.gemfile deleted file mode 100644 index 4690ee6..0000000 --- a/gemfiles/activerecord31.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../" - -gem "sqlite3" -gem "activerecord", "~> 3.1.0" diff --git a/gemfiles/activerecord32.gemfile b/gemfiles/activerecord32.gemfile deleted file mode 100644 index b1901ca..0000000 --- a/gemfiles/activerecord32.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../" - -gem "sqlite3" -gem "activerecord", "~> 3.2.0" diff --git a/gemfiles/activerecord40.gemfile b/gemfiles/activerecord40.gemfile deleted file mode 100644 index 8136201..0000000 --- a/gemfiles/activerecord40.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../" - -gem "sqlite3" -gem "activerecord", "~> 4.0.0" -gem "activejob_backport" diff --git a/gemfiles/activerecord41.gemfile b/gemfiles/activerecord41.gemfile deleted file mode 100644 index 467456b..0000000 --- a/gemfiles/activerecord41.gemfile +++ /dev/null @@ -1,8 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../" - -gem "sqlite3" -gem "activerecord", "~> 4.1.0" -gem "activejob_backport" diff --git a/gemfiles/mongoid2.gemfile b/gemfiles/mongoid2.gemfile deleted file mode 100644 index fc19022..0000000 --- a/gemfiles/mongoid2.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../" - -gem "mongoid", "~> 2" -gem "bson_ext" diff --git a/gemfiles/mongoid3.gemfile b/gemfiles/mongoid3.gemfile deleted file mode 100644 index 4a5e339..0000000 --- a/gemfiles/mongoid3.gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../" - -gem "mongoid", "~> 3.1.0" diff --git a/gemfiles/mongoid4.gemfile b/gemfiles/mongoid4.gemfile deleted file mode 100644 index ffbbc87..0000000 --- a/gemfiles/mongoid4.gemfile +++ /dev/null @@ -1,7 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../" - -gem "mongoid", "~> 4.0.0" -gem "activejob_backport" diff --git a/gemfiles/nobrainer.gemfile b/gemfiles/nobrainer.gemfile deleted file mode 100644 index d59f02b..0000000 --- a/gemfiles/nobrainer.gemfile +++ /dev/null @@ -1,6 +0,0 @@ -source 'https://rubygems.org' - -# Specify your gem's dependencies in searchkick.gemspec -gemspec path: "../" - -gem "nobrainer", "0.27.0" diff --git a/test/ci/before_install.sh b/test/ci/before_install.sh new file mode 100755 index 0000000..a3b9ff9 --- /dev/null +++ b/test/ci/before_install.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +sudo apt-get purge elasticsearch +wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.7.3.deb +sudo dpkg -i elasticsearch-1.7.3.deb +sudo service elasticsearch start + +if [ -n "$NOBRAINER" ]; then + source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list + wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add - + sudo apt-get update -q + sudo apt-get install rethinkdb + sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf + sudo service rethinkdb restart +fi diff --git a/test/gemfiles/activerecord31.gemfile b/test/gemfiles/activerecord31.gemfile new file mode 100644 index 0000000..4690ee6 --- /dev/null +++ b/test/gemfiles/activerecord31.gemfile @@ -0,0 +1,7 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in searchkick.gemspec +gemspec path: "../" + +gem "sqlite3" +gem "activerecord", "~> 3.1.0" diff --git a/test/gemfiles/activerecord32.gemfile b/test/gemfiles/activerecord32.gemfile new file mode 100644 index 0000000..b1901ca --- /dev/null +++ b/test/gemfiles/activerecord32.gemfile @@ -0,0 +1,7 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in searchkick.gemspec +gemspec path: "../" + +gem "sqlite3" +gem "activerecord", "~> 3.2.0" diff --git a/test/gemfiles/activerecord40.gemfile b/test/gemfiles/activerecord40.gemfile new file mode 100644 index 0000000..8136201 --- /dev/null +++ b/test/gemfiles/activerecord40.gemfile @@ -0,0 +1,8 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in searchkick.gemspec +gemspec path: "../" + +gem "sqlite3" +gem "activerecord", "~> 4.0.0" +gem "activejob_backport" diff --git a/test/gemfiles/activerecord41.gemfile b/test/gemfiles/activerecord41.gemfile new file mode 100644 index 0000000..467456b --- /dev/null +++ b/test/gemfiles/activerecord41.gemfile @@ -0,0 +1,8 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in searchkick.gemspec +gemspec path: "../" + +gem "sqlite3" +gem "activerecord", "~> 4.1.0" +gem "activejob_backport" diff --git a/test/gemfiles/mongoid2.gemfile b/test/gemfiles/mongoid2.gemfile new file mode 100644 index 0000000..fc19022 --- /dev/null +++ b/test/gemfiles/mongoid2.gemfile @@ -0,0 +1,7 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in searchkick.gemspec +gemspec path: "../" + +gem "mongoid", "~> 2" +gem "bson_ext" diff --git a/test/gemfiles/mongoid3.gemfile b/test/gemfiles/mongoid3.gemfile new file mode 100644 index 0000000..4a5e339 --- /dev/null +++ b/test/gemfiles/mongoid3.gemfile @@ -0,0 +1,6 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in searchkick.gemspec +gemspec path: "../" + +gem "mongoid", "~> 3.1.0" diff --git a/test/gemfiles/mongoid4.gemfile b/test/gemfiles/mongoid4.gemfile new file mode 100644 index 0000000..ffbbc87 --- /dev/null +++ b/test/gemfiles/mongoid4.gemfile @@ -0,0 +1,7 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in searchkick.gemspec +gemspec path: "../" + +gem "mongoid", "~> 4.0.0" +gem "activejob_backport" diff --git a/test/gemfiles/nobrainer.gemfile b/test/gemfiles/nobrainer.gemfile new file mode 100644 index 0000000..d59f02b --- /dev/null +++ b/test/gemfiles/nobrainer.gemfile @@ -0,0 +1,6 @@ +source 'https://rubygems.org' + +# Specify your gem's dependencies in searchkick.gemspec +gemspec path: "../" + +gem "nobrainer", "0.27.0" -- libgit2 0.21.0