Skip to content

Commit db7a50b

Browse files
committed
Update the Travis config & dependencies
- use Chrome instead of phantomjs - use allow failures for 1.0 (for now) - use allow failures for 0.11 (for now) - remove zepto
1 parent c15053f commit db7a50b

File tree

2 files changed

+13
-25
lines changed

2 files changed

+13
-25
lines changed

.travis.yml

+10-22
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
language: ruby
23
sudo: false
34

@@ -6,34 +7,21 @@ script: bundle exec rake $RUN
67

78
matrix:
89
include:
9-
- rvm: 2.4.2
10+
- rvm: 2.6
1011
env: OPAL_VERSION='master'
11-
- rvm: 2.3.4
12-
env: OPAL_VERSION='~> 0.10.5'
13-
- rvm: 2.1.10
14-
env: RACK_VERSION='< 2.0'
15-
- rvm: 2.0.0
16-
env: RACK_VERSION='< 2.0'
17-
18-
# We use 2.1.9 to differentiate the rvm version
19-
# as travis doesn't allow failures by env.
20-
- rvm: 2.1.9
21-
env: RUN=zepto PATH=".:$PATH" RACK_VERSION='< 2.0'
12+
- rvm: 2.5
13+
env: OPAL_VERSION='~> 1.0.1' RUN='jquery3'
14+
- rvm: 2.4
15+
env: OPAL_VERSION='~> 0.11.4'
2216

2317
allow_failures:
24-
- rvm: 2.1.9 # zepto
25-
18+
- rvm: 2.5 # opal 1.0
19+
- rvm: 2.4 # opal 0.11
2620

2721
cache:
2822
bundler: true
2923
directories:
3024
- node_modules
3125

32-
before_install:
33-
- gem update --system
34-
- "export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH"
35-
- "if [ $(phantomjs --version) != '2.1.1' ]; then rm -rf $PWD/travis_phantomjs; mkdir -p $PWD/travis_phantomjs; fi"
36-
- "if [ $(phantomjs --version) != '2.1.1' ]; then wget https://assets.membergetmember.co/software/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2; fi"
37-
- "if [ $(phantomjs --version) != '2.1.1' ]; then tar -xvf $PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis_phantomjs; fi"
38-
- "phantomjs --version"
39-
26+
addons:
27+
chrome: stable

opal-jquery.gemspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
1515
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
1616
s.require_paths = ['lib']
1717

18-
s.add_runtime_dependency 'opal', ['>= 0.10.0', '< 2.0']
19-
s.add_development_dependency 'opal-rspec', ['>= 0.7', '< 2.0']
20-
s.add_development_dependency 'opal-sprockets', ['>= 0.4.1', '< 2.0']
18+
s.add_runtime_dependency 'opal', '>= 0.11.4', '< 1.1'
19+
s.add_development_dependency 'opal-rspec', '~> 0.8.0.alpha2'
20+
s.add_development_dependency 'opal-sprockets', '~> 0.4.1'
2121
s.add_development_dependency 'yard'
2222
s.add_development_dependency 'rake'
2323
s.add_development_dependency 'puma'

0 commit comments

Comments
 (0)