aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Bühler <pabuhler@cisco.com>2018-10-23 14:14:44 +0200
committerGitHub <noreply@github.com>2018-10-23 14:14:44 +0200
commita7e3b5939927d54b97c699e137b970fcff9c6236 (patch)
treef694ac2d8358732064d8981421c61a5bb3b2ba35
parentc6b431c62b76597908ec91caa2fe746137455d9b (diff)
parent60be61d45f2fc17f4bbf509a543c8ca1aba2051e (diff)
downloadplatform_external_libsrtp2-a7e3b5939927d54b97c699e137b970fcff9c6236.tar.gz
platform_external_libsrtp2-a7e3b5939927d54b97c699e137b970fcff9c6236.tar.bz2
platform_external_libsrtp2-a7e3b5939927d54b97c699e137b970fcff9c6236.zip
Merge pull request #433 from pabuhler/osx-ci-update
osx ci update
-rw-r--r--.travis.yml19
1 files changed, 14 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 0bf506c..edb6179 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,21 +74,30 @@ matrix:
- make runtest
- make runtest-valgrind
- # default osx build with xcode (clang)
+ # default osx build
- os: osx
env:
- - TEST="osx XCode 8.2"
- osx_image: xcode8.2
+ - TEST="osx"
script:
- EXTRA_CFLAGS=-Werror ./configure
- make
- make runtest
+ # osx build with openssl
+ - os: osx
+ env:
+ - TEST="osx openssl"
+ before_install:
+ - brew install openssl
+ script:
+ - PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig EXTRA_CFLAGS=-Werror ./configure --enable-openssl
+ - make
+ - make runtest
+
# osx build with nss
- os: osx
env:
- - TEST="osx (nss)"
- osx_image: xcode8.2
+ - TEST="osx nss"
before_install:
- brew install nss
script: