Skip to content

Commit a7e3b59

Browse files
authored
Merge pull request #433 from pabuhler/osx-ci-update
osx ci update
2 parents c6b431c + 60be61d commit a7e3b59

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

.travis.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,30 @@ matrix:
7474
- make runtest
7575
- make runtest-valgrind
7676

77-
# default osx build with xcode (clang)
77+
# default osx build
7878
- os: osx
7979
env:
80-
- TEST="osx XCode 8.2"
81-
osx_image: xcode8.2
80+
- TEST="osx"
8281
script:
8382
- EXTRA_CFLAGS=-Werror ./configure
8483
- make
8584
- make runtest
8685

86+
# osx build with openssl
87+
- os: osx
88+
env:
89+
- TEST="osx openssl"
90+
before_install:
91+
- brew install openssl
92+
script:
93+
- PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig EXTRA_CFLAGS=-Werror ./configure --enable-openssl
94+
- make
95+
- make runtest
96+
8797
# osx build with nss
8898
- os: osx
8999
env:
90-
- TEST="osx (nss)"
91-
osx_image: xcode8.2
100+
- TEST="osx nss"
92101
before_install:
93102
- brew install nss
94103
script:

0 commit comments

Comments
 (0)