mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
try sudo:false on travis
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
244916d43b
commit
0a641b4cc2
2 changed files with 8 additions and 7 deletions
13
.travis.yml
13
.travis.yml
|
@ -18,6 +18,7 @@
|
|||
|
||||
# Language specification.
|
||||
language: c
|
||||
sudo: false
|
||||
|
||||
# Compilers. Several compilers are provided in Travis, so we try them all.
|
||||
# The value set here is visible via $CC environment variable.
|
||||
|
@ -35,16 +36,16 @@ os:
|
|||
# far since the 1.9.1 release.
|
||||
before_install:
|
||||
- "CONFIG_FLAG="
|
||||
- "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq update; fi"
|
||||
# - "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq update; fi"
|
||||
# Travis ships an outdated, broken version of libssl by default
|
||||
- "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 JOBS='-j'; 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 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
|
||||
# like test-all, test-rubyspec. This is because they take too much time,
|
||||
|
@ -68,7 +69,7 @@ before_script:
|
|||
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then echo 'exclude :test_deadlock_by_signal_at_forking, \"under investigation\"' >> test/excludes/TestProcess.rb; fi"
|
||||
script:
|
||||
- "make test"
|
||||
- "make test-all TESTOPTS='-q -j2'"
|
||||
- "make test-all TESTOPTS='-q -j3'"
|
||||
- "make test-rubyspec"
|
||||
after_failure:
|
||||
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then find ~/Library/Logs/DiagnosticReports -type f -name ruby_\\*.crash -ls -execdir cat {} \\; -delete; fi"
|
||||
|
|
|
@ -167,7 +167,7 @@ SHOWFLAGS = showflags
|
|||
|
||||
all: $(SHOWFLAGS) main docs
|
||||
|
||||
main: $(SHOWFLAGS) $(ENCSTATIC:static=lib)encs exts
|
||||
main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
|
||||
@$(NULLCMD)
|
||||
|
||||
.PHONY: showflags
|
||||
|
|
Loading…
Reference in a new issue