浏览代码

Travis fix for glbinding Linux clang, removed IRC screenshot script

Thomas Buck 9 年前
父节点
当前提交
6790d48965
共有 3 个文件被更改,包括 2 次插入38 次删除
  1. 0
    7
      .travis.yml
  2. 0
    31
      cmake/travis_after_success_linux.sh
  3. 2
    0
      cmake/travis_script_linux.sh

+ 0
- 7
.travis.yml 查看文件

@@ -16,9 +16,6 @@ script:
16 16
     - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_script_linux.sh; fi; fi
17 17
     - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_script_mac.sh; fi; fi
18 18
 
19
-after_success:
20
-    - if [ ${COVERITY_SCAN_BRANCH} != 1 ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_after_success_linux.sh; fi; fi
21
-
22 19
 notifications:
23 20
     email:
24 21
         recipients:
@@ -35,10 +32,6 @@ os:
35 32
     - linux
36 33
     - osx
37 34
 
38
-matrix:
39
-    allow_failures:
40
-        - os: linux
41
-
42 35
 env:
43 36
     global:
44 37
         # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created

+ 0
- 31
cmake/travis_after_success_linux.sh 查看文件

@@ -1,31 +0,0 @@
1
-#!/bin/bash
2
-
3
-cd build
4
-cd src
5
-
6
-echo "set basedir \".\"" > OpenRaider.ini
7
-echo "set pakdir \".\"" >> OpenRaider.ini
8
-echo "set audiodir \".\"" >> OpenRaider.ini
9
-echo "set datadir \"../../data\"" >> OpenRaider.ini
10
-echo "set font \"../../data/test.ttf\"" >> OpenRaider.ini
11
-
12
-xvfb-run -n 99 -s "-screen 0 1280x1024x24" ./OpenRaider &
13
-
14
-# Wait for OpenRaider to start
15
-wget http://imgur.com/tools/imgurbash.sh
16
-chmod a+x ./imgurbash.sh
17
-sleep 10
18
-
19
-import -window root -display :99.0 screenshot.png
20
-./imgurbash.sh screenshot.png > url
21
-(
22
-    echo "NICK OR-$(echo -n $TRAVIS_OS_NAME)-$(echo -n $CC)"
23
-    echo "USER OR-$(echo -n $TRAVIS_OS_NAME)-$(echo -n $CC) 9 \* :OR-$(echo -n $TRAVIS_OS_NAME)-$(echo -n $CC)"
24
-    sleep 5
25
-    echo "JOIN #OpenRaider"
26
-    sleep 5
27
-    echo "PRIVMSG #OpenRaider :New Screenshot $(cat url | head -n 1)"
28
-    sleep 5
29
-    echo QUIT
30
-) | nc chat.freenode.net 6667
31
-

+ 2
- 0
cmake/travis_script_linux.sh 查看文件

@@ -6,8 +6,10 @@ if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
6 6
 if [ "$CC" = "clang" ]; then export CC="clang-3.5"; fi
7 7
 if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.5"; fi
8 8
 
9
+# Need to build current glbinding from source
9 10
 git clone https://github.com/hpicgs/glbinding.git
10 11
 cd glbinding
12
+sed -i 's/  -Werror/  /g' cmake/PlatformLinuxGCC.cmake
11 13
 mkdir build
12 14
 cd build
13 15
 cmake ..

正在加载...
取消
保存