Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0699fba

Browse files
committedJan 25, 2016
Merge remote-tracking branch 'origin' into mcjit
2 parents bab0934 + fa397f8 commit 0699fba

File tree

101 files changed

+1496
-368
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1496
-368
lines changed
 

Diff for: ‎.travis.yml

+5-18
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ sudo: required
33
dist: trusty
44
compiler:
55
- clang
6+
os:
7+
- linux
8+
- osx
9+
ruby: 2.2.0
610
before_install:
711
- echo $LANG
812
- echo $LC_ALL
9-
- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update && sudo apt-get install -y libedit-dev llvm-3.6; fi
13+
- if [ $TRAVIS_OS_NAME == linux ]; then ./scripts/llvm.sh; fi
1014
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install llvm; fi
11-
- rvm use $RVM --install --binary --fuzzy
1215
- gem update --system
1316
- gem --version
1417
before_script:
@@ -21,8 +24,6 @@ after_success:
2124
branches:
2225
only:
2326
- master
24-
- 1.8.7
25-
- 2.2
2627
- "/^v\\d+\\./"
2728
notifications:
2829
email: false
@@ -37,24 +38,10 @@ notifications:
3738
on_success: change
3839
on_failure: always
3940
on_start: always
40-
matrix:
41-
exclude:
42-
- compiler: clang
43-
- os: linux
44-
- os: osx
45-
include:
46-
- env: RVM=rbx-2
47-
os: osx
48-
- env: RVM=2.2.0
49-
os: linux
50-
compiler: clang
5141
env:
5242
global:
5343
- LANG="en_US.UTF-8"
5444
- RBXOPT=-Xint
5545
- secure: olbok/GN6rOYvPnHBYWGz7giCoCdLFpT/7WSBHukYO3E0uNeqAUOOgW2BFOwCVWdSEJ/iTvJXZQ4qVZHX+6jRfvILZeGv+D2P93VdD8UFQRoTOfFC7esAo525s9fuKm9ehUGWZxlzGOBHHckky1jn6pEf8mlXAVM5e76dlH0fck=
5646
- secure: aqG9eB/PrzQ7XJQN6YX/00sNVvwSB77saxXQzguL2WFjAXB74h6168Hzq+awHtNX/vfOb6ta7fpWLHrA0D+gmZnvTR29VlP6nd0vs1tkdX1/jWbiBHjamRffp+NWVdKbJKYn5iLOGXcuUMOzY/opLKOdvxKZfkxGMxR2tTNLZUE=
5747
- secure: eElvNLjuFZAuixJdgom4Kv8RDziE4ArFcSEwYctvprMe/414CAaJcFkjQKg0RrJzAxZ51oGjdcZhEfmjNXcUU1gA5l++IdnlQm0x4kt8r7aql+q2geHzrrjhhwPujT9a8JNtXs6dHnbi+quNlxyVItWzeGJsjyhJzH8hxiFhCYI=
58-
os:
59-
- linux
60-
- osx

Diff for: ‎Gemfile.installed

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gem "daedalus-core", "~> 0.1"
88
gem "rubinius-build_tools", "~> 2.0"
99
gem "rubinius-developer_tools", "~> 2.0"
1010

11-
gem "rubysl", "~> 2.0"
11+
gem "rubysl", "~> 2.2"
1212
gem "rubysl-test-unit", "~> 2.0"
1313
gem "minitest", "~> 4.7"
1414
gem "racc", "~> 1.4"

0 commit comments

Comments
 (0)