From 7cb5b7dd23afa39fe569f8312b4fe84e66ac8e61 Mon Sep 17 00:00:00 2001 From: hsbt Date: Wed, 13 Jan 2016 08:22:18 +0000 Subject: [PATCH] * .travis.yml: removed commented-out code. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53527 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- .travis.yml | 7 +------ ChangeLog | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1710907108..f87ffd3483 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,12 +34,7 @@ os: # far since the 1.9.1 release. before_install: - "CONFIG_FLAG=" -# - "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 4'; fi" -#install: "if [[ $TRAVIS_OS_NAME = 'linux' ]]; then sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null; fi" + - "JOBS='-j 4'" # 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, diff --git a/ChangeLog b/ChangeLog index 2c5947baf1..90c30c6584 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jan 13 17:21:45 2016 SHIBATA Hiroshi + + * .travis.yml: removed commented-out code. + Wed Jan 13 17:14:54 2016 SHIBATA Hiroshi * .travis.yml: removed osx code. follow up with r53517