Commit 79475e8598932e948c8482d9ec0e155dc49f8a38
1 parent
ca060184
Exists in
master
and in
21 other branches
Moved ci and gemfiles into test directory
Showing
19 changed files
with
80 additions
and
80 deletions
Show diff stats
.travis.yml
... | ... | @@ -4,7 +4,7 @@ services: |
4 | 4 | - elasticsearch |
5 | 5 | - mongodb |
6 | 6 | before_install: |
7 | - - ./ci/before_install.sh | |
7 | + - ./test/ci/before_install.sh | |
8 | 8 | script: bundle exec rake test |
9 | 9 | before_script: |
10 | 10 | - psql -c 'create database searchkick_test;' -U postgres |
... | ... | @@ -14,14 +14,14 @@ notifications: |
14 | 14 | on_failure: change |
15 | 15 | gemfile: |
16 | 16 | - Gemfile |
17 | - - gemfiles/activerecord41.gemfile | |
18 | - - gemfiles/activerecord40.gemfile | |
19 | - - gemfiles/activerecord32.gemfile | |
20 | - - gemfiles/activerecord31.gemfile | |
21 | - - gemfiles/mongoid2.gemfile | |
22 | - - gemfiles/mongoid3.gemfile | |
23 | - - gemfiles/mongoid4.gemfile | |
17 | + - test/gemfiles/activerecord41.gemfile | |
18 | + - test/gemfiles/activerecord40.gemfile | |
19 | + - test/gemfiles/activerecord32.gemfile | |
20 | + - test/gemfiles/activerecord31.gemfile | |
21 | + - test/gemfiles/mongoid2.gemfile | |
22 | + - test/gemfiles/mongoid3.gemfile | |
23 | + - test/gemfiles/mongoid4.gemfile | |
24 | 24 | matrix: |
25 | 25 | include: |
26 | - - gemfile: gemfiles/nobrainer.gemfile | |
26 | + - gemfile: test/gemfiles/nobrainer.gemfile | |
27 | 27 | env: NOBRAINER=true | ... | ... |
ci/before_install.sh
... | ... | @@ -1,15 +0,0 @@ |
1 | -#!/usr/bin/env bash | |
2 | - | |
3 | -sudo apt-get purge elasticsearch | |
4 | -wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.7.3.deb | |
5 | -sudo dpkg -i elasticsearch-1.7.3.deb | |
6 | -sudo service elasticsearch start | |
7 | - | |
8 | -if [ -n "$NOBRAINER" ]; then | |
9 | - source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list | |
10 | - wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add - | |
11 | - sudo apt-get update -q | |
12 | - sudo apt-get install rethinkdb | |
13 | - sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf | |
14 | - sudo service rethinkdb restart | |
15 | -fi |
gemfiles/activerecord31.gemfile
gemfiles/activerecord32.gemfile
gemfiles/activerecord40.gemfile
gemfiles/activerecord41.gemfile
gemfiles/mongoid2.gemfile
gemfiles/mongoid3.gemfile
gemfiles/mongoid4.gemfile
gemfiles/nobrainer.gemfile
... | ... | @@ -0,0 +1,15 @@ |
1 | +#!/usr/bin/env bash | |
2 | + | |
3 | +sudo apt-get purge elasticsearch | |
4 | +wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-1.7.3.deb | |
5 | +sudo dpkg -i elasticsearch-1.7.3.deb | |
6 | +sudo service elasticsearch start | |
7 | + | |
8 | +if [ -n "$NOBRAINER" ]; then | |
9 | + source /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | sudo tee /etc/apt/sources.list.d/rethinkdb.list | |
10 | + wget -qO- http://download.rethinkdb.com/apt/pubkey.gpg | sudo apt-key add - | |
11 | + sudo apt-get update -q | |
12 | + sudo apt-get install rethinkdb | |
13 | + sudo cp /etc/rethinkdb/default.conf.sample /etc/rethinkdb/instances.d/instance1.conf | |
14 | + sudo service rethinkdb restart | |
15 | +fi | ... | ... |