[前][次][番号順一覧][スレッド一覧]

ruby-changes:39627

From: naruse <ko1@a...>
Date: Thu, 27 Aug 2015 16:07:40 +0900 (JST)
Subject: [ruby-changes:39627] naruse:r51708 (trunk): Revert "try to run travis without sudo to run in container"

naruse	2015-08-27 16:07:18 +0900 (Thu, 27 Aug 2015)

  New Revision: 51708

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=51708

  Log:
    Revert "try to run travis without sudo to run in container"
    
    This reverts commit r51705, r51706.

  Modified files:
    trunk/.travis.yml
Index: .travis.yml
===================================================================
--- .travis.yml	(revision 51707)
+++ .travis.yml	(revision 51708)
@@ -16,10 +16,6 @@ https://github.com/ruby/ruby/blob/trunk/.travis.yml#L16
 #
 # 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: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L35
 # 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,

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]