diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2014-09-15 18:20:31 +0100 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2014-09-18 13:39:12 +0100 |
| commit | 547b5ea6fbdb5fa924bd382b2cbba3d873d9be87 (patch) | |
| tree | 3a3fa61df1b51814b8c53d092d1506da882d94ba | |
| parent | 11ba79894a13ddaee4bfcdd64d23fd4b54a041f3 (diff) | |
| download | servo-547b5ea6fbdb5fa924bd382b2cbba3d873d9be87.tar.gz servo-547b5ea6fbdb5fa924bd382b2cbba3d873d9be87.zip | |
Make Travis upload to doc.servo.org again.
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | etc/ci/travis.script.sh | 35 |
2 files changed, 17 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml index 078a3b5c9ee..8a3a5a52331 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,5 @@ language: c -os: -- linux -- osx - install: ./etc/ci/travis.install.sh before_script: ./etc/ci/travis.before_script.sh @@ -25,11 +21,13 @@ env: - LD_LIBRARY_PATH: /usr/local/lib - secure: "C/9/o+5KdTY1LZ4qZGE1+gY6mEGamG/VDHP69Om9dklfchJD6C+j8K8dvmE26FeRnLhSL7eGf1b3m6lfgkTZeVFjjiZE0Exvf1yI9Y3QPWR7ViaFxWk1z1I4HaSu4fpBo++e8FW+0EGjIkIrRtAn+bav3eDpAhgSih10KmAx4a8=" matrix: - - TASKS=build,test-content,test-ref,build-cef + - TASKS=build,test-content,test-ref,push-doc,build-cef matrix: include: - os: osx + env: TASKS=build,test-content,test-ref,build-cef + - os: osx env: TASKS=build,test-wpt1 - os: osx env: TASKS=build,test-wpt2 diff --git a/etc/ci/travis.script.sh b/etc/ci/travis.script.sh index fce94992eb2..e3f87c9af7d 100755 --- a/etc/ci/travis.script.sh +++ b/etc/ci/travis.script.sh @@ -2,27 +2,6 @@ set -e -build_docs() { - ./mach doc - cp etc/doc.servo.org/* target/doc/ - cp -R rust/doc/* target/doc/ - - if [ "${TRAVIS_BRANCH}" = "master" ] && [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - echo '<meta http-equiv=refresh content=0;url=servo/index.html>' > target/doc/index.html - sudo pip install ghp-import - ghp-import -n target/doc - git push -qf https://${TOKEN}@github.com/servo/doc.servo.org.git gh-pages - fi -} - -build_servo() { - ./mach build -j 2 -} - -build_cef() { - ./mach build-cef -j 2 -} - IFS="," read -ra tasks <<< "${TASKS}" for t in "${tasks[@]}"; do # OS specific setup @@ -54,6 +33,20 @@ for t in "${tasks[@]}"; do test-wpt1) ./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 etc/doc.servo.org/* target/doc/ + cp -R rust/doc/* 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." ;; |