Skip to content

Commit 424dd40

Browse files
committed
Update travis file to use conan environment
1 parent c08b643 commit 424dd40

File tree

1 file changed

+23
-8
lines changed

1 file changed

+23
-8
lines changed

.travis.yml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,56 @@
1-
language: c
1+
language: python
2+
python: "3.7"
23

34
notifications:
45
email: false
56

67
env:
78
- PACKAGE_NAME="shockolate-$TRAVIS_OS_NAME.tgz"
89

10+
addons:
11+
apt:
12+
packages:
13+
- libx32gcc-5-dev libc6-dev-i386 gcc-multilib g++-multilib libglu1-mesa-dev:i386 libgl1-mesa-dev:i386
14+
# For conan's sdl2-mixer
15+
- libasound2-dev:i386 libpulse-dev:i386 libglib2.0-dev:i386
16+
17+
install:
18+
- pip install --upgrade pip
19+
- pip install conan
20+
- conan user
21+
- conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
22+
923
matrix:
1024
include:
1125
- os: linux
12-
dist: trusty
26+
dist: xenial
1327
sudo: required
1428
env:
1529
- SDL2_LIB=BUNDLED
1630
- SDL2_MIXER_LIB=BUNDLED
1731
- FLUIDSYNTH_LIB=BUNDLED
18-
addons:
19-
apt:
20-
packages:
21-
- cmake-data cmake libx32gcc-4.8-dev libc6-dev-i386 gcc-multilib g++-multilib libglu1-mesa-dev:i386 libgl1-mesa-dev:i386
2232
compiler: gcc
2333
- os: osx
34+
osx_image: xcode9.4
35+
language: shell
2436
compiler: clang
2537
env:
2638
- SDL2_LIB=BUNDLED
2739
- SDL2_MIXER_LIB=BUNDLED
2840
- FLUIDSYNTH_LIB=OFF # Bundled lib failed to compile
2941
- os: osx
42+
osx_image: xcode9.4
43+
language: shell
3044
compiler: gcc
3145
env:
3246
- SDL2_LIB=BUNDLED
3347
- SDL2_MIXER_LIB=BUNDLED
3448
- FLUIDSYNTH_LIB=OFF # Bundled lib failed to compile
3549

3650
script:
37-
- sudo TRAVIS=$TRAVIS ./osx-linux/install_32bit_sdl.sh
38-
- cmake -DCMAKE_LIBRARY_PATH=/usr/lib/i386-linux-gnu -DENABLE_SDL2=${SDL2_LIB} -DENABLE_SOUND=${SDL2_MIXER_LIB} -DENABLE_FLUIDSYNTH=${FLUIDSYNTH_LIB} .
51+
- mkdir build && cd build
52+
- conan install .. --settings arch=x86 --build=missing
53+
- cmake .. -DCMAKE_LIBRARY_PATH=/usr/lib/i386-linux-gnu -DENABLE_SDL2=${SDL2_LIB} -DENABLE_SOUND=${SDL2_MIXER_LIB} -DENABLE_FLUIDSYNTH=${FLUIDSYNTH_LIB}
3954
- make -j2 systemshock
4055

4156
before_deploy:

0 commit comments

Comments
 (0)