Ver Fonte

For Travis CI - change the subshell to bash shell. Pardon our dust.

Yao Wei Tjong 姚伟忠 há 12 anos atrás
pai
commit
ca36bf1e17
1 ficheiros alterados com 6 adições e 6 exclusões
  1. 6 6
      .travis.yml

+ 6 - 6
.travis.yml

@@ -12,14 +12,14 @@ env:
 language: cpp
 compiler: gcc
 before_install:
-    - sh -e /etc/init.d/xvfb start && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24
-    - sh -c "[ $ANDROID_NDK ] && wget -q http://dl.google.com/android/android-sdk_r22.3-linux.tgz && tar xzf *.tgz && rm *.tgz && ln -s android-sdk* android-sdk && wget -q http://dl.google.com/android/ndk/android-ndk-r9c-linux-x86_64.tar.bz2 && tar xjf *.bz2 && rm *.bz2 && ln -s android-ndk* android-ndk || true"
-    - sh -c "[ $SITE_UPDATE ] && sudo add-apt-repository ppa:george-edison55/precise-backports -y && sudo apt-get update -q -y || true"
+    - bash -e /etc/init.d/xvfb start && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24
+    - bash -c "[ $ANDROID_NDK ] && wget -q http://dl.google.com/android/android-sdk_r22.3-linux.tgz && tar xzf *.tgz && rm *.tgz && ln -s android-sdk* android-sdk && wget -q http://dl.google.com/android/ndk/android-ndk-r9c-linux-x86_64.tar.bz2 && tar xjf *.bz2 && rm *.bz2 && ln -s android-ndk* android-ndk || true"
+    - bash -c "[ $SITE_UPDATE ] && sudo add-apt-repository ppa:george-edison55/precise-backports -y && sudo apt-get update -q -y || true"
 install:
     - sudo apt-get install -q -y --no-install-recommends libasound2-dev
     - rvm gemset use global && gem install rake
-    - sh -c "[ x$ENABLE_64BIT == 'x0' ] &&  sudo apt-get install -q -y libxrandr-dev:i386 libgl1-mesa-dev:i386 g++-multilib || true"
-    - sh -c "[ $ANDROID_NDK ] &&  sudo apt-get install -q -y --no-install-recommends openjdk-7-jdk g++-multilib && (while :; do echo 'y'; sleep 1; done) |android-sdk/tools/android update sdk --no-ui --filter platform-tool,build-tools-19.0.1,android-19,system-image,extra-android-support || true"
-    - sh -c "[ $SITE_UPDATE ] && sudo apt-get install -q -y --no-install-recommends doxygen graphviz || true"
+    - bash -c "[ x$ENABLE_64BIT == 'x0' ] &&  sudo apt-get install -q -y libxrandr-dev:i386 libgl1-mesa-dev:i386 g++-multilib || true"
+    - bash -c "[ $ANDROID_NDK ] &&  sudo apt-get install -q -y --no-install-recommends openjdk-7-jdk g++-multilib && (while :; do echo 'y'; sleep 1; done) |android-sdk/tools/android update sdk --no-ui --filter platform-tool,build-tools-19.0.1,android-19,system-image,extra-android-support || true"
+    - bash -c "[ $SITE_UPDATE ] && sudo apt-get install -q -y --no-install-recommends doxygen graphviz || true"
 script: rake travis_ci
 after_success: rake travis_ci_site_update