Skip to content

Commit 7fd9f8e

Browse files
Revert "Disable OSX builds"
1 parent a400c23 commit 7fd9f8e

File tree

1 file changed

+38
-0
lines changed

1 file changed

+38
-0
lines changed

.travis.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,32 @@ jobs:
3939
# env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
4040
env: COMPILER="ccache g++-5"
4141

42+
# OS X using g++
43+
- stage: Test different OS/CXX/Flags
44+
os: osx
45+
sudo: false
46+
compiler: gcc
47+
cache: ccache
48+
before_install:
49+
#we create symlink to non-ccache gcc, to be used in tests
50+
- mkdir bin ; ln -s /usr/bin/gcc bin/gcc
51+
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
52+
- export PATH=/usr/local/opt/ccache/libexec:$PATH
53+
env: COMPILER="ccache g++"
54+
55+
# OS X using clang++
56+
- stage: Test different OS/CXX/Flags
57+
os: osx
58+
sudo: false
59+
compiler: clang
60+
cache: ccache
61+
before_install:
62+
- HOMEBREW_NO_AUTO_UPDATE=1 brew install ccache
63+
- export PATH=/usr/local/opt/ccache/libexec:$PATH
64+
env:
65+
- COMPILER="ccache clang++ -Qunused-arguments -fcolor-diagnostics"
66+
- CCACHE_CPP2=yes
67+
4268
# Ubuntu Linux with glibc using g++-5, debug mode
4369
- stage: Test different OS/CXX/Flags
4470
os: linux
@@ -127,6 +153,18 @@ jobs:
127153
- cmake --build build -- -j4
128154
script: (cd build; ctest -V -L CORE)
129155

156+
- stage: Test different OS/CXX/Flags
157+
os: osx
158+
cache: ccache
159+
env:
160+
- BUILD_SYSTEM=cmake
161+
- CCACHE_CPP2=yes
162+
install:
163+
- cmake -H. -Bbuild '-DCMAKE_BUILD_TYPE=Release' '-DCMAKE_OSX_ARCHITECTURES=x86_64'
164+
- cmake --build build -- -j4
165+
script: (cd build; ctest -V -L CORE)
166+
167+
130168
allow_failures:
131169
- <<: *linter-stage
132170

0 commit comments

Comments
 (0)