Page MenuHomePhabricator (Chris)
Files F86431

No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.travis.yml b/.travis.yml
index b4fcdf8..182acf2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,59 +1,63 @@
os:
- linux
- osx
-compiler:
- - gcc
- - clang
+#compiler:
+# - gcc
+# - clang
# sudo: required
# dist: trusty
language: cpp
# compiler:
# - gcc
-addons:
- apt:
- packages:
- - libsfml-dev
+#addons:
+# apt:
+# packages:
+# - libsfml-dev
matrix:
include:
- os: linux
dist: trusty
sudo: required
+ compiler:
+ - gcc
- os: osx
osx_image: xcode7.2
+ compiler:
+ - clang
# before_script:
# - sudo apt-get install -y libjpeg62-dev libsndfile1-dev libglew1.5 libglew1.5-dev libfreetype6 libjpeg-turbo8 libjpeg8 libopenal-data libopenal1 libxrandr2 libxrender1 libsoil1 cppcheck libsfml-dev
-script:
- lsb_release -a
- cmake .
- make
- #qmake -makefile pagan_board.pro && make && make && cppcheck . --enable=all
+#script:
+# lsb_relea<F12>se -a
+# cmake .
+# make
+#qmake -makefile pagan_board.pro && make && make && cppcheck . --enable=all
before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh scripts/travis_before_install_linux.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh scripts/travis_before_install_osx.sh; fi
- "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
- ps axu |grep Xvfb -i
- sleep 4
before_script:
- "export DISPLAY=:99.0"
- glxinfo
- sleep 4 # give xvfb some time to start
- echo "GOOO"
script:
- - "export DISPLAY=:99.0"
- - ps axu |grep Xvfb -i
- - glxinfo
- - cmake .
- - make
- - ./DeerPortal-0.8.1-x86_64.AppImage
- - DISPLAY=:1 xwd -root -silent | convert xwd:- png:screenshot.png
+ - bash scripts/travis_make.sh
+ # - "export DISPLAY=:99.0"
+ # - cmake .
+ # - ps axu |grep Xvfb -i
+ # - glxinfo
+ # - ./DeerPortal-0.8.1-x86_64.AppImage
+ # - DISPLAY=:1 xwd -root -silent | convert xwd:- png:screenshot.png
diff --git a/scripts/travis_before_install_linux.sh b/scripts/travis_before_install_linux.sh
index ad3f201..ed3dd1c 100644
--- a/scripts/travis_before_install_linux.sh
+++ b/scripts/travis_before_install_linux.sh
@@ -1,8 +1,9 @@
sudo apt install xvfb x11-apps mesa-utils
+sudo apt build-dep libsfml-dev
#Xvfb :3 -screen 0 1900x1080x24 &
#export DISPLAY=:3
#./DeerPortal-0.8.1-x86_64.AppImage &
#DISPLAY=:1 xwd -root -silent | convert xwd:- png:/tmp/screenshot.png
diff --git a/scripts/travis_make.sh b/scripts/travis_make.sh
new file mode 100644
index 0000000..8becc1f
--- /dev/null
+++ b/scripts/travis_make.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+if [ $TRAVIS_OS_NAME = 'linux' ]; then
+
+ # Install some custom requirements on macOS
+ # e.g. brew install pyenv-virtualenv
+
+ case "${TOXENV}" in
+ py32)
+ # Install some custom Python 3.2 requirements on macOS
+ ;;
+ py33)
+ # Install some custom Python 3.3 requirements on macOS
+ ;;
+ esac
+else
+ # Install some custom requirements on Linux
+fi
+
+if [ $TRAVIS_OS_NAME = 'osx' ]; then
+cmake .
+make
+fi
+

File Metadata

Mime Type
text/x-diff
Expires
Fri, Sep 12, 3:57 PM (1 d, 11 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
42903
Default Alt Text
(3 KB)

Event Timeline