Skip to content
This repository was archived by the owner on Oct 19, 2018. It is now read-only.

Commit d29f00b

Browse files
catmandocatmando
committed
Merge branch 'edge' of github.com:ruby-hyperloop/hyper-mesh into edge
2 parents 3d6ba04 + 9d74c25 commit d29f00b

File tree

6 files changed

+453
-19
lines changed

6 files changed

+453
-19
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ spec/test_app/log/development.log
1414
spec/test_app/Gemfile.lock
1515
/synchromesh-simple-poller-store
1616
/synchromesh-pusher-channel-store
17-
/Gemfile.lock
1817
/examples/action-cable/rails_cache_dir/
1918
rails_cache_dir/
2019
react_prerendering_src.js

‎.travis.yml

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
1+
dist: trusty
12
language: ruby
3+
cache: bundler
24
rvm:
3-
- ruby
5+
- 2.4.4
6+
- 2.5.1
7+
- ruby-head
48
services:
59
- mysql
610
env:
7-
- HYPER_DEV_GEM_SOURCE="https://gems.ruby-hyperloop.org" TZ=Europe/Berlin
11+
- DRIVER=google-chrome TZ=Europe/Berlin
812
before_install:
9-
- sudo apt-get install -y fonts-liberation
10-
- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
11-
- sudo dpkg -i google-chrome*.deb
13+
- if [[ "$DRIVER" == "google-chrome" ]]; then wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -; fi
14+
- if [[ "$DRIVER" == "google-chrome" ]]; then echo "deb http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list; fi
15+
- if [[ "$DRIVER" == "google-chrome" ]]; then sudo apt-get update -qq && sudo apt-get install -qq -y google-chrome-stable; fi
16+
- sudo apt-get install -qq -y fonts-liberation
1217
- gem install bundler
1318
before_script:
1419
- cd spec/test_app
15-
- bundle update
16-
- rails db:setup
20+
- bundle install --jobs=3 --retry=3
21+
- bundle exec rails db:setup
1722
- cd ../../
18-
- chromedriver-update
19-
- ls -lR ~/.chromedriver-helper/
23+
- if [[ "$DRIVER" == "google-chrome" ]]; then chromedriver-update; fi
24+
- if [[ "$DRIVER" == "google-chrome" ]]; then ls -lR ~/.chromedriver-helper/; fi
25+
- if [[ "$DRIVER" == "google-chrome" ]]; then chromedriver --version; fi
26+
- if [[ "$DRIVER" == "google-chrome" ]]; then google-chrome --version; fi
27+
- if [[ "$DRIVER" == "google-chrome" ]]; then which chromedriver; fi
28+
- if [[ "$DRIVER" == "google-chrome" ]]; then which google-chrome; fi
2029
script: bundle exec rspec
2130
gemfile:
22-
- gemfiles/opal_0_10_react-rails_2_3.gemfile
23-
- gemfiles/opal_0_10_react-rails_2_4.gemfile
24-
- gemfiles/opal_0_11_react-rails_2_4.gemfile
31+
- gemfiles/hyper-mesh.gemfile
2532
matrix:
26-
allow_failures:
27-
- gemfile: gemfiles/opal_0_11_react-rails_2_4.gemfile
33+
fast_finish: true

0 commit comments

Comments
 (0)