diff options
author | bors-servo <metajack+bors@gmail.com> | 2014-11-05 21:15:33 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2014-11-05 21:15:33 -0700 |
commit | 667b511ae3c885deb544afd1bcd80c0ca4669858 (patch) | |
tree | f03a45951ff2284a5a09212d16f9f07246bc195b | |
parent | 0e6a67c76b9dd862baae5ee5d3b729d3d573dd82 (diff) | |
parent | 7b103838801734b75163519c2e88674ba589ee60 (diff) | |
download | servo-667b511ae3c885deb544afd1bcd80c0ca4669858.tar.gz servo-667b511ae3c885deb544afd1bcd80c0ca4669858.zip |
auto merge of #3909 : SimonSapin/servo/remove-travis-files, r=jdm
-rwxr-xr-x | etc/ci/travis.before_script.sh | 15 | ||||
-rwxr-xr-x | etc/ci/travis.install.sh | 28 | ||||
-rwxr-xr-x | etc/ci/travis.script.sh | 54 |
3 files changed, 0 insertions, 97 deletions
diff --git a/etc/ci/travis.before_script.sh b/etc/ci/travis.before_script.sh deleted file mode 100755 index f1fa1248a48..00000000000 --- a/etc/ci/travis.before_script.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -e - -case ${TRAVIS_OS_NAME} in - linux) - /usr/bin/Xorg :1 -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config etc/ci/xorg.conf & - - # Patch the broken font config files on ubuntu 12.04 lts - this should be removed when travis moves to ubuntu 14.04 lts - sudo cp etc/ci/fontconfig/* /etc/fonts/conf.avail/ - ;; - - osx) - ;; -esac diff --git a/etc/ci/travis.install.sh b/etc/ci/travis.install.sh deleted file mode 100755 index 3f44ec6a727..00000000000 --- a/etc/ci/travis.install.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -e - -case ${TRAVIS_OS_NAME} in - linux) - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y - sudo apt-get update -q - sudo apt-get install -qq --force-yes -y xserver-xorg-input-void xserver-xorg-video-dummy xpra - sudo apt-get install -qq --force-yes -y gperf libXxf86vm-dev libstdc++6-4.7-dev - echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | sudo debconf-set-selections - sudo apt-get install ttf-mscorefonts-installer > /dev/null - - # install glfw - git clone https://github.com/glfw/glfw.git - cd glfw - git checkout 3.0.3 - cmake -DCMAKE_C_FLAGS=-fPIC -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF . - make - sudo make install - cd .. - ;; - - osx) - brew install pkg-config python glfw3 - pip install virtualenv - ;; -esac diff --git a/etc/ci/travis.script.sh b/etc/ci/travis.script.sh deleted file mode 100755 index e8eaafe34c6..00000000000 --- a/etc/ci/travis.script.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -set -e - -IFS="," read -ra tasks <<< "${TASKS}" -for t in "${tasks[@]}"; do - # OS specific setup - case ${TRAVIS_OS_NAME} in - linux) - export DISPLAY=:1.0 - export RUST_TEST_TASKS=1 - ;; - osx) - ;; - esac - - case $t in - build) - ./mach build -j 2 - ;; - build-cef) - ./mach build-cef -j 2 - ;; - test-content) - ./mach test-content - ;; - test-ref) - ./mach test-ref --kind cpu - ;; - test-wpt1) - ./mach test-wpt --processes=2 --total-chunks=2 --this-chunk=1 - ;; - test-wpt2) - ./mach test-wpt --processes=2 --total-chunks=2 --this-chunk=2 - ;; - push-doc) - if [ "${TRAVIS_BRANCH}" = "master" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ] - then - mkdir -p target/doc - cp -R ~/.servo/rust/$(cat rust-snapshot-hash)*/doc/* target/doc/ - cp etc/doc.servo.org/* target/doc/ - ./mach doc # After copying rust/doc, so that the crate index is correct. - sudo pip install ghp-import - ghp-import -n target/doc - git push -qf https://${TOKEN}@github.com/servo/doc.servo.org.git gh-pages - else - echo Skipping rustdoc - fi - ;; - *) - echo "Task $t not recognized." - ;; - esac -done |