Skip to content
Permalink
Browse files
Merge remote-tracking branch 'origin' into codedb
  • Loading branch information
brixen committed Jan 9, 2016
2 parents 2f8dac4 + 648a80c commit d0d5ff611534a14e802f803410a4d52519056341
Showing 448 changed files with 9,352 additions and 6,418 deletions.
@@ -1,54 +1,58 @@
language: cpp

compiler:
- gcc
- clang

- clang
before_install:
- echo $LANG
- echo $LC_ALL
- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update && sudo apt-get install -y llvm-3.4 llvm-3.4-dev; fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install llvm && brew link --force llvm; fi
- rvm use $RVM --install --binary --fuzzy
- gem update --system
- gem --version

- echo $LANG
- echo $LC_ALL
- if [ $TRAVIS_OS_NAME == linux ]; then ./scripts/llvm.sh; fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install llvm35 && brew link --force llvm35; fi
- rvm use $RVM --install --binary --fuzzy
- gem update --system
- gem --version
before_script:
- travis_retry bundle
- if [ $TRAVIS_OS_NAME == linux ]; then travis_retry ./configure --llvm-config llvm-config-3.4; fi
- if [ $TRAVIS_OS_NAME == osx ]; then travis_retry ./configure --llvm-config /usr/local/opt/llvm/bin/llvm-config; fi

- travis_retry bundle
- if [ $TRAVIS_OS_NAME == linux ]; then travis_retry ./configure --llvm-config=./vendor/llvm/Release/bin/llvm-config; fi
- if [ $TRAVIS_OS_NAME == osx ]; then travis_retry ./configure; fi
script: rake ci

after_success:
- if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then rake deploy; fi

- if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then ./scripts/deploy.sh all; fi
branches:
only:
- master
- 1.8.7
- 2.2
- /^v\d+\./

- master
- 1.8.7
- 2.2
- "/^v\\d+\\./"
notifications:
email: false
irc:
channels:
- "chat.freenode.net#rubinius"
- chat.freenode.net#rubinius
template:
- "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
- "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
webhooks:
urls:
- https://webhooks.gitter.im/e/9502afd22ca6c8e85fb3
- https://webhooks.gitter.im/e/9502afd22ca6c8e85fb3
on_success: change
on_failure: always
on_start: always

matrix:
exclude:
- compiler: clang
- os: linux
- os: osx
include:
- env: RVM=rbx-2
os: osx
- env: RVM=2.2.0
os: linux
compiler: clang
env:
- RVM=2.0.0 LANG="en_US.UTF-8"

global:
- LANG="en_US.UTF-8"
- secure: olbok/GN6rOYvPnHBYWGz7giCoCdLFpT/7WSBHukYO3E0uNeqAUOOgW2BFOwCVWdSEJ/iTvJXZQ4qVZHX+6jRfvILZeGv+D2P93VdD8UFQRoTOfFC7esAo525s9fuKm9ehUGWZxlzGOBHHckky1jn6pEf8mlXAVM5e76dlH0fck=
- secure: aqG9eB/PrzQ7XJQN6YX/00sNVvwSB77saxXQzguL2WFjAXB74h6168Hzq+awHtNX/vfOb6ta7fpWLHrA0D+gmZnvTR29VlP6nd0vs1tkdX1/jWbiBHjamRffp+NWVdKbJKYn5iLOGXcuUMOzY/opLKOdvxKZfkxGMxR2tTNLZUE=
- secure: eElvNLjuFZAuixJdgom4Kv8RDziE4ArFcSEwYctvprMe/414CAaJcFkjQKg0RrJzAxZ51oGjdcZhEfmjNXcUU1gA5l++IdnlQm0x4kt8r7aql+q2geHzrrjhhwPujT9a8JNtXs6dHnbi+quNlxyVItWzeGJsjyhJzH8hxiFhCYI=
os:
- linux
# - osx

osx_image: xcode61
- linux
- osx
sudo: false
@@ -0,0 +1,27 @@
BSD 3-clause License

Copyright (c) 2007-2015, Evan Phoenix and contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of Rubinius nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -27,6 +27,27 @@ Gist:
These two files contain the output of the compilation process and the various
configuration options used (e.g. compiler options).

### Version Managers

We can *not* help you with any issues that might be caused by a Ruby version
manager. In the event of any issues please try building from source instead to
see if the issue is caused by Rubinius itself or your version manager of choice.

Issues involving version managers will be closed if they can either not be
reproduced when building from source, or when the original report makes no
mention about the author having tried building from source.

Note that this only applies to the installation procedure. Problems with the
runtime can of course still be reported, even when using a version manager.

### Rubinius Versions

Rubinius releases quite often, at least more often than most other
implementations. As such we ask users to try out the latest version prior to
reporting an issue. This ensures we don't have to start digging through the
code, only to find out the problem has already been resolved in a more recent
release.

### Running Specs

MSpec provides several different scripts to run the specs under different
@@ -15,7 +15,7 @@ gem "racc", "~> 1.4"
gem "rake", "~> 10.1"
gem "json", "~> 1.8"
gem "rdoc", "~> 4.0"
gem "psych", "= 2.0.10"
gem "psych", "= 2.0.17"

gem "rb-readline", "~> 0.5"
gem "rubysl-readline", "~> 2.0"
@@ -27,3 +27,6 @@ DEPENDENCIES
redcard (~> 1.0)
rubinius-bridge (~> 1.0)
rubinius-build_tools (~> 2.0)

BUNDLED WITH
1.11.2
Loading

0 comments on commit d0d5ff6

Please sign in to comment.