summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-02-09 09:12:47 +0100
committerRichard Levitte <levitte@openssl.org>2018-02-09 10:03:40 +0100
commita6da6b73ca480cfa6fe8d0a882f4ff549d46fcff (patch)
treea27cc0d9e65061702c041db53aeb854051985d6b /.travis.yml
parentb9ed9ab38e492fa070c3d7ed63233e3debc36528 (diff)
Revert ".travis.yml: remove osx from build matrix."
Recent changes seem to have gotten OS X back on track, so we should be able to run our tests there again. This reverts commit e12e903e9ac675d08f9dd0db1f0c1a2049232c21. Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5292)
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index cfc11b6851..0586fb3e51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ addons:
os:
- linux
+ - osx
compiler:
- clang