Skip to content

Commit 7fe99ae

Browse files
committedJan 25, 2016
Merge remote-tracking branch 'origin' into codedb
2 parents d0d5ff6 + fa397f8 commit 7fe99ae

File tree

97 files changed

+1460
-353
lines changed

Some content is hidden

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

97 files changed

+1460
-353
lines changed
 

Diff for: ‎.travis.yml

+5-18
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
language: cpp
22
compiler:
33
- clang
4+
os:
5+
- linux
6+
- osx
7+
sudo: false
8+
ruby: 2.2.0
49
before_install:
510
- echo $LANG
611
- echo $LC_ALL
712
- if [ $TRAVIS_OS_NAME == linux ]; then ./scripts/llvm.sh; fi
813
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install llvm35 && brew link --force llvm35; fi
9-
- rvm use $RVM --install --binary --fuzzy
1014
- gem update --system
1115
- gem --version
1216
before_script:
@@ -19,8 +23,6 @@ after_success:
1923
branches:
2024
only:
2125
- master
22-
- 1.8.7
23-
- 2.2
2426
- "/^v\\d+\\./"
2527
notifications:
2628
email: false
@@ -35,24 +37,9 @@ notifications:
3537
on_success: change
3638
on_failure: always
3739
on_start: always
38-
matrix:
39-
exclude:
40-
- compiler: clang
41-
- os: linux
42-
- os: osx
43-
include:
44-
- env: RVM=rbx-2
45-
os: osx
46-
- env: RVM=2.2.0
47-
os: linux
48-
compiler: clang
4940
env:
5041
global:
5142
- LANG="en_US.UTF-8"
5243
- secure: olbok/GN6rOYvPnHBYWGz7giCoCdLFpT/7WSBHukYO3E0uNeqAUOOgW2BFOwCVWdSEJ/iTvJXZQ4qVZHX+6jRfvILZeGv+D2P93VdD8UFQRoTOfFC7esAo525s9fuKm9ehUGWZxlzGOBHHckky1jn6pEf8mlXAVM5e76dlH0fck=
5344
- secure: aqG9eB/PrzQ7XJQN6YX/00sNVvwSB77saxXQzguL2WFjAXB74h6168Hzq+awHtNX/vfOb6ta7fpWLHrA0D+gmZnvTR29VlP6nd0vs1tkdX1/jWbiBHjamRffp+NWVdKbJKYn5iLOGXcuUMOzY/opLKOdvxKZfkxGMxR2tTNLZUE=
5445
- secure: eElvNLjuFZAuixJdgom4Kv8RDziE4ArFcSEwYctvprMe/414CAaJcFkjQKg0RrJzAxZ51oGjdcZhEfmjNXcUU1gA5l++IdnlQm0x4kt8r7aql+q2geHzrrjhhwPujT9a8JNtXs6dHnbi+quNlxyVItWzeGJsjyhJzH8hxiFhCYI=
55-
os:
56-
- linux
57-
- osx
58-
sudo: false

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)
Please sign in to comment.