summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-31 14:36:42 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-31 14:36:42 +0000
commit9896f4695a3e029df553d1b6f1af7e6ef05fa85d (patch)
tree0caa5c3f4701a416ff9170a93f5d414b8ec74ea8
parentd1cfb475c73a87e52312183af9710fbfc16a21de (diff)
Update libssl before Travis build
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--.travis.yml2
-rw-r--r--ChangeLog6
2 files changed, 8 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 992f40fa10..b4d08e4359 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,8 @@ os:
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'; fi"
- "if [[ $TRAVIS_OS_NAME = 'osx' ]]; then brew install autoconf gdbm openssl; fi"
diff --git a/ChangeLog b/ChangeLog
index 8f924e208a..3ec5c19b37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 31 23:34:27 2015 Aaron Patterson <tenderlove@ruby-lang.org>
+
+ * .travis.yml: update libssl before running tests.
+ Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for figuring out the
+ travis settings!
+
Fri Jul 31 21:34:49 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* load.c (rb_require_internal): use rb_load_internal0 not to raise