Skip to content

Commit

Permalink
RUBY-1663 Test on ruby 2.6 (#117)
Browse files Browse the repository at this point in the history
  • Loading branch information
p-mongo committed Jan 21, 2019
1 parent 88be97f commit 5e4ab05
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .evergreen/.evg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,10 @@ axes:
display_name: ruby-2.5
variables:
RVM_RUBY: "ruby-2.5"
- id: "ruby-2.6"
display_name: ruby-2.6
variables:
RVM_RUBY: "ruby-2.6"
# - id: "ruby-head"
# display_name: ruby-head
# variables:
Expand Down Expand Up @@ -579,7 +583,7 @@ buildvariants:
# - name: "test"

- matrix_name: "activesupport"
matrix_spec: { mri-rubies: "ruby-2.5", all-os: "ubuntu1404", as: as }
matrix_spec: { mri-rubies: "ruby-2.6", all-os: "ubuntu1404", as: as }
display_name: "AS ${mri-rubies}, ${all-os}"
tasks:
- name: "test"
Expand Down
9 changes: 8 additions & 1 deletion .evergreen/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,14 @@ else
echo "MACHINE not set in environment" 1>&2
exit 2
fi
toolchain_url=https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/$MACHINE/8cd47ac2cf636710740a6d79167f055e4c0a0154/mongo_ruby_driver_toolchain_`echo $MACHINE |tr - _`_8cd47ac2cf636710740a6d79167f055e4c0a0154_18_08_24_03_45_11.tar.gz
if test $MACHINE = rhel71-ppc || test $MACHINE = rhel72-s390x || test $MACHINE = ubuntu1604-arm; then
# Use older toolchain, and test on ruby 2.5 instead of 2.6,
# until the various build tickets get resolved.
toolchain_url=https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/$MACHINE/8cd47ac2cf636710740a6d79167f055e4c0a0154/mongo_ruby_driver_toolchain_`echo $MACHINE |tr - _`_8cd47ac2cf636710740a6d79167f055e4c0a0154_18_08_24_03_45_11.tar.gz
#toolchain_url=https://s3.amazonaws.com/mongo-ruby-toolchain/71b0db9edb54ded6260b32cd73d8ea1699af1279/$MACHINE/ruby-toolchain.tar.gz
else
toolchain_url=https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/$MACHINE/8cd47ac2cf636710740a6d79167f055e4c0a0154/mongo_ruby_driver_toolchain_`echo $MACHINE |tr - _`_patch_8cd47ac2cf636710740a6d79167f055e4c0a0154_5c452b76e3c3312273591db4_19_01_21_02_16_23.tar.gz
fi
curl -fL $toolchain_url |tar zxf -
export PATH=`pwd`/rubies/$RVM_RUBY/bin:$PATH

Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ before_install:

rvm:
- 1.9.3
- 2.5
- 2.6

env: CI="travis"

Expand Down

0 comments on commit 5e4ab05

Please sign in to comment.