Skip to content

Commit abe362e

Browse files
committed
Unify settings for osx and linux
1 parent 9053388 commit abe362e

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
language: python
22
python: "3.7"
33

4+
compiler:
5+
- clang
6+
- gcc
7+
48
notifications:
59
email: false
610

@@ -10,31 +14,27 @@ addons:
1014
- cmake-data cmake libglu1-mesa-dev libgl1-mesa-dev
1115

1216
install:
13-
- pip install --upgrade pip
14-
- pip install conan
1517
- conan user
1618
- conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
1719

1820
matrix:
1921
include:
2022
- os: linux
2123
dist: bionic
24+
before_install:
25+
- pip install --upgrade pip
26+
- pip install conan
2227
sudo: required
2328
env:
2429
- SDL2_LIB=BUNDLED
2530
- SDL2_MIXER_LIB=BUNDLED
2631
- FLUIDSYNTH_LIB=BUNDLED
2732
- BITS=64
28-
compiler: gcc
29-
- os: osx
30-
compiler: clang
31-
env:
32-
- SDL2_LIB=BUNDLED
33-
- SDL2_MIXER_LIB=BUNDLED
34-
- FLUIDSYNTH_LIB=BUNDLED
35-
- BITS=64
3633
- os: osx
37-
compiler: gcc
34+
language: shell
35+
before_install:
36+
- pip3 install --upgrade pip
37+
- pip3 install conan
3838
env:
3939
- SDL2_LIB=BUNDLED
4040
- SDL2_MIXER_LIB=BUNDLED

0 commit comments

Comments
 (0)