1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* .travis.yml: removed osx code. follow up with r53517

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53526 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2016-01-13 08:15:39 +00:00
parent be61b2b12d
commit 6cea22b5d6
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -24,11 +24,9 @@ sudo: false
# The value set here is visible via $CC environment variable. # The value set here is visible via $CC environment variable.
compiler: compiler:
- gcc - gcc
# - clang
os: os:
- linux - linux
# - osx
# Dependencies. Some header files are missing in a Travis' worker VM, so we # Dependencies. Some header files are missing in a Travis' worker VM, so we
# have to install them. The "1.9.1" here is OK. It is the most adopted # have to install them. The "1.9.1" here is OK. It is the most adopted
@ -41,17 +39,12 @@ before_install:
# - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq --only-upgrade install '^libssl.*'; fi" # - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq --only-upgrade install '^libssl.*'; fi"
# - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq install $CC; fi" # upgrade if any # - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq install $CC; fi" # upgrade if any
- "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then JOBS='-j 4'; fi" - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then JOBS='-j 4'; fi"
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then brew install autoconf gdbm openssl; fi"
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then CONFIG_FLAG=\"$CONFIG_FLAG --with-gdbm-dir=`brew --prefix gdbm`\"; fi"
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then CONFIG_FLAG=\"$CONFIG_FLAG --with-openssl-dir=`brew --prefix openssl`\"; fi"
- "if [[ $TRAVIS_OS_NAME = 'osx' && $CC = 'gcc' ]]; then CC='gcc-4.9'; fi"
#install: "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null; fi" #install: "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null; fi"
# Script is where the test runs. Note we just do "make test", not other tests # Script is where the test runs. Note we just do "make test", not other tests
# like test-all, test-rubyspec. This is because they take too much time, # like test-all, test-rubyspec. This is because they take too much time,
# enough for Travis to shut down the VM as being stalled. # enough for Travis to shut down the VM as being stalled.
before_script: before_script:
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then rm -f ~/Library/Logs/DiagnosticReports/ruby_*.crash; fi"
- "uname -a" - "uname -a"
- "uname -r" - "uname -r"
- "rm -fr .ext autom4te.cache" - "rm -fr .ext autom4te.cache"
@ -67,13 +60,10 @@ before_script:
- "make after-update BASERUBY=ruby" - "make after-update BASERUBY=ruby"
- "make -s $JOBS" - "make -s $JOBS"
- "make update-rubyspec" - "make update-rubyspec"
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then echo 'exclude :test_deadlock_by_signal_at_forking, \"under investigation\"' >> test/excludes/TestProcess.rb; fi"
script: script:
- "make test TESTOPTS=--color=never" - "make test TESTOPTS=--color=never"
- "make test-all TESTOPTS='-q -j3 --color=never --job-status=normal'" - "make test-all TESTOPTS='-q -j3 --color=never --job-status=normal'"
- "make test-rubyspec MSPECOPT=-fm" - "make test-rubyspec MSPECOPT=-fm"
after_failure:
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then find ~/Library/Logs/DiagnosticReports -type f -name ruby_\\*.crash -ls -execdir cat {} \\; -delete; fi"
# Branch matrix. Not all branches are Travis-ready so we limit branches here. # Branch matrix. Not all branches are Travis-ready so we limit branches here.
branches: branches:

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Jan 13 17:14:54 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* .travis.yml: removed osx code. follow up with r53517
Wed Jan 13 16:56:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jan 13 16:56:19 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* iseq.c (rb_iseq_mark): mark parent iseq to prevent dynamically * iseq.c (rb_iseq_mark): mark parent iseq to prevent dynamically