mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Revert "try to run travis without sudo to run in container"
This reverts commit r51705, r51706. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51708 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d995d98a08
commit
a20929cb72
1 changed files with 4 additions and 8 deletions
12
.travis.yml
12
.travis.yml
|
@ -16,10 +16,6 @@
|
|||
#
|
||||
# is also a good place to look at.
|
||||
|
||||
# new infrastructure
|
||||
# http://docs.travis-ci.com/user/migrating-from-legacy/
|
||||
sudo: false
|
||||
|
||||
# Language specification.
|
||||
language: c
|
||||
|
||||
|
@ -39,16 +35,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 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 = '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,
|
||||
|
|
Loading…
Add table
Reference in a new issue