Skip to content

Commit 7ccfd94

Browse files
committed
Travis:
- update Rubies, "2.4" will actually install latest 2.4.x version - also use more recent JRuby versions - update InfluxDB versions - use travis_retry to hide flaky concurrent spec - prevent RubyGems update when installing MRI 2.2 (fixes #224)
1 parent e252137 commit 7ccfd94

File tree

2 files changed

+44
-27
lines changed

2 files changed

+44
-27
lines changed

.travis.yml

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ sudo: required
22
dist: trusty
33
language: ruby
44
before_install:
5-
- gem update --system --no-doc
6-
- gem install bundler --no-doc
7-
- gem update bundler --no-doc
5+
- bin/travis.sh
86
- bin/provision.sh
97
rvm:
10-
- 2.2.9
11-
- 2.3.8
12-
- 2.4.5
13-
- 2.5.3
8+
- "2.2"
9+
- "2.3"
10+
- "2.4"
11+
- "2.5"
12+
- "2.6"
1413
- ruby-head
1514
env:
1615
- TEST_TASK=spec
@@ -19,37 +18,42 @@ matrix:
1918
allow_failures:
2019
- rvm: jruby-head
2120
- rvm: ruby-head
22-
- rvm: jruby-9.1.5.0
23-
- rvm: 2.5.3
21+
- rvm: jruby-9.1.17.0
22+
- rvm: jruby-9.2.5.0
23+
- rvm: "2.6"
2424
env: influx_version=nightly channel=nightlies
2525
include:
26-
- rvm: 2.5.3
26+
- rvm: "2.6"
2727
env: TEST_TASK=rubocop
28-
- rvm: jruby-9.1.5.0
28+
29+
- rvm: jruby-9.1.17.0
30+
env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
31+
- rvm: jruby-9.2.5.0
32+
env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
2933
- rvm: jruby-head
3034
env: JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -J-Xmx256M'
31-
- rvm: 2.5.3
35+
36+
- rvm: "2.6"
3237
env: influx_version=1.0.2 pkghash=88f6c30fec2c6e612e802e23b9161fdfc7c5c29f6be036f0376326445aff0037
33-
- rvm: 2.5.3
34-
env: influx_version=1.1.0 pkghash=f1520a2e18e0ab47e8a8810671e07d5a47960e54f7553b78bebe7d3c7594742f
35-
- rvm: 2.5.3
38+
- rvm: "2.6"
39+
env: influx_version=1.1.5 pkghash=0ecb9385cc008f6e5094e6e8f8ea70522023a16d4397e401898f3973176d3b21
40+
- rvm: "2.6"
3641
env: influx_version=1.2.4 pkghash=2fac8391e04aa1bec9151e8f0d8f18df030c866af2b4963ab7d86c6ddc172182
37-
- rvm: 2.5.3
38-
env: influx_version=1.3.6 pkghash=6406cdd21466bcb832b967078adaa9f07cb6ae524a6579c15141692031f5f840
39-
- rvm: 2.5.3
42+
- rvm: "2.6"
43+
env: influx_version=1.3.8 pkghash=35c9cb2943bbde04aa5e94ad6d8caf5fc9b1480bdbcde7c34078de135cc4f788
44+
- rvm: "2.6"
4045
env: influx_version=1.4.3 pkghash=0477080f1d1cf8e1242dc7318280b9010c4c45cf6a415a2a5de607ae17fa0359
41-
- rvm: 2.5.3
42-
env: influx_version=1.5.2 pkghash=42fede7b497bdf30d4eb5138db218d1add986fca4fce4a8bcd9c7d6dabaf572a
43-
- rvm: 2.5.3
44-
env: influx_version=1.6.1 pkghash=a833ac16890182a75983c61e5fe6471ae27cbab7984d7b7361034887b7428de2
45-
- rvm: 2.5.3
46-
env: influx_version=1.7.0 pkghash=0615a395b3f8e68455b0a8a2584d00ff8694f62caf77468900f7cf0a77f2b8be
47-
- rvm: 2.5.3
46+
- rvm: "2.6"
47+
env: influx_version=1.5.4 pkghash=fa6f8d3196d13ffc376d533581b534692c738181ce3427c53484c138d9e6b902
48+
- rvm: "2.6"
49+
env: influx_version=1.6.4 pkghash=dbfa13a0f9e38a8e7b19294c30144903bb681ac0aba0a3a8f4f349c37d5de5f9
50+
- rvm: "2.6"
51+
env: influx_version=1.7.2 pkghash=0bce61b7d89bf3216a7d3cb7a38423bd1c3a1b7d2ea8086b39cb26130ad78995
52+
- rvm: "2.6"
4853
env: influx_version=nightly channel=nightlies
49-
fail_fast: true
5054
addons:
5155
apt:
5256
packages:
5357
- haveged
5458
- libgmp-dev
55-
script: bundle exec rake $TEST_TASK
59+
script: travis_retry bundle exec rake $TEST_TASK

bin/travis.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
3+
set -ex
4+
5+
# Rubygems 3.0 requires Ruby 2.3
6+
if [ "$TRAVIS_RUBY_VERSION" = "2.2" ]; then
7+
gem update --system 2.7.7
8+
else
9+
gem update --system --no-doc
10+
fi
11+
12+
gem install bundler --no-doc
13+
gem update bundler --no-doc

0 commit comments

Comments
 (0)