Skip to content

Commit d9f3a2f

Browse files
peterschrammelsmowton
authored andcommitted
Revert "Disable OSX builds"
1 parent 81bb39c commit d9f3a2f

File tree

1 file changed

+38
-0
lines changed

1 file changed

+38
-0
lines changed

.travis.yml

+38
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,32 @@ jobs:
6666
# env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
6767
env: COMPILER="ccache g++-5"
6868

69+
# OS X using g++
70+
- stage: Test different OS/CXX/Flags
71+
os: osx
72+
sudo: false
73+
compiler: gcc
74+
cache: ccache
75+
before_install:
76+
#we create symlink to non-ccache gcc, to be used in tests
77+
- mkdir bin ; ln -s /usr/bin/gcc bin/gcc
78+
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
79+
- export PATH=/usr/local/opt/ccache/libexec:$PATH
80+
env: COMPILER="ccache g++"
81+
82+
# OS X using clang++
83+
- stage: Test different OS/CXX/Flags
84+
os: osx
85+
sudo: false
86+
compiler: clang
87+
cache: ccache
88+
before_install:
89+
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
90+
- export PATH=/usr/local/opt/ccache/libexec:$PATH
91+
env:
92+
- COMPILER="ccache clang++ -Qunused-arguments -fcolor-diagnostics"
93+
- CCACHE_CPP2=yes
94+
6995
# Ubuntu Linux with glibc using g++-5, debug mode
7096
- stage: Test different OS/CXX/Flags
7197
os: linux
@@ -154,6 +180,18 @@ jobs:
154180
- cmake --build build -- -j4
155181
script: (cd build; ctest -V -L CORE)
156182

183+
- stage: Test different OS/CXX/Flags
184+
os: osx
185+
cache: ccache
186+
env:
187+
- BUILD_SYSTEM=cmake
188+
- CCACHE_CPP2=yes
189+
install:
190+
- cmake -H. -Bbuild '-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_OSX_ARCHITECTURES=x86_64'
191+
- cmake --build build -- -j4
192+
script: (cd build; ctest -V -L CORE)
193+
194+
157195
# Run Coverity
158196
- stage: Test different OS/CXX/Flags
159197
os: linux

0 commit comments

Comments
 (0)