Browse Source

Add shared library type into Travis CI build test matrix.

Site documentation update is skipped when building shared library type.
Yao Wei Tjong 姚伟忠 12 years ago
parent
commit
fcfeb6aad2
2 changed files with 6 additions and 3 deletions
  1. 4 1
      .travis.yml
  2. 2 2
      Rakefile

+ 4 - 1
.travis.yml

@@ -4,8 +4,11 @@ before_install:
     - sudo add-apt-repository ppa:george-edison55/precise-backports -y
     - sudo apt-get update -qq
     - sudo apt-get install -qq libx11-dev libxrandr-dev libasound2-dev libgl1-mesa-dev doxygen graphviz
-script: ./cmake_gcc.sh -DENABLE_64BIT=1 -DENABLE_LUAJIT=1 -DENABLE_LUAJIT_AMALG=1 -DENABLE_SAMPLES=1 -DENABLE_TOOLS=1 -DENABLE_EXTRAS=1 && cd Build && make
+script: ./cmake_gcc.sh -DURHO3D_LIB_TYPE=$TEST_LIB_TYPE -DENABLE_64BIT=1 -DENABLE_LUAJIT=1 -DENABLE_LUAJIT_AMALG=1 -DENABLE_SAMPLES=1 -DENABLE_TOOLS=1 -DENABLE_EXTRAS=1 && cd Build && make
 after_success: rake travis
 env:
   global:
     secure: ST80PPq8cTIZ5WRgX4BJ7gKhHonNge9GdYH0PuTvCZot13Rk+oNkbzkkCT/KuQHmyUU65gE2HCyMYYqNDNyxy0Upi8jMUjgXdy7SN5zORVhyc/Ymfd6rt3sgVOT6YYlbegI3sFLVdaH4jdyyMqPQHW72StZ25NUQi0p682FAGD0=
+  matrix:
+    - TEST_LIB_TYPE=STATIC
+    - TEST_LIB_TYPE=SHARED

+ 2 - 2
Rakefile

@@ -3,8 +3,8 @@ require "rubygems"
 # Usage: NOT intended to be used manually (if you insist then try: GIT_NAME=... GIT_EMAIL=... GH_TOKEN=... TRAVIS_BRANCH=master rake travis)
 desc 'Update site documentation to GitHub Pages'
 task :travis do
-  # Skip documentation update if it is a pull request or if it is a commit in topic branch
-  if ENV['TRAVIS_PULL_REQUEST'].to_i > 0 or ENV['TRAVIS_BRANCH'] != 'master'
+  # Skip documentation update if one of the following conditions is met
+  if ENV['TRAVIS_PULL_REQUEST'].to_i > 0 or ENV['TRAVIS_BRANCH'] != 'master' or ENV['TEST_LIB_TYPE'] == 'SHARED'
     next
   end
   # Pull or clone