Skip to content

Commit

Permalink
CI: update Ubuntu and xcode images
Browse files Browse the repository at this point in the history
  • Loading branch information
paroj committed Nov 28, 2018
1 parent d225c22 commit 96d28da
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
language: cpp
sudo: required
dist: trusty
dist: xenial
branches:
only:
- master
addons:
apt:
sources:
- sourceline: "deb http://archive.ubuntu.com/ubuntu/ trusty multiverse"
- sourceline: "deb http://archive.ubuntu.com/ubuntu/ trusty-backports universe"
- sourceline: "ppa:nschloe/swig-backports"
- sourceline: "deb http://archive.ubuntu.com/ubuntu/ xenial multiverse"
- sourceline: "deb http://archive.ubuntu.com/ubuntu/ xenial-backports universe"
packages:
- cmake
- libxaw7-dev
Expand All @@ -30,7 +29,7 @@ before_script:
# we start compilation afterwards anyway, so no need to sleep
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start ; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install freetype libzzip sdl2 ; fi
osx_image: xcode10
osx_image: xcode10.1
env:
- TEST=TRUE
- GL3ES=TRUE # build GL3Plus and GLES2 Rendersystems
Expand Down Expand Up @@ -68,7 +67,7 @@ script:
# run visual tests
- if [ $TEST ]; then cd build/bin && ./TestContext -rs "OpenGL Rendering Subsystem" ; fi
# verify that the python modules are loadable
- if [ $TEST ]; then cd ../lib && python3 -c "import _Ogre; import _OgreRTShader" ; fi
- if [ $TEST ]; then cd ../lib && python -c "import _Ogre; import _OgreRTShader" ; fi
os:
- linux
- osx
Expand Down

0 comments on commit 96d28da

Please sign in to comment.