Merge pull request #3473 from servo/disable_travis

Disable travis

Reviewed-by: SimonSapin

5 files changed, 22 insertions, 36 deletions

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8a3a5a52331..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-language: c
-
-install: ./etc/ci/travis.install.sh
-
-before_script: ./etc/ci/travis.before_script.sh
-
-script: ./etc/ci/travis.script.sh
-
-git:
-  submodules: false
-
-notifications:
-  irc:
-    channels: "irc.mozilla.org#servo"
-    on_success: change
-    on_failure: change
-    use_notice: true
-
-env:
-  global:
-    - LD_LIBRARY_PATH: /usr/local/lib
-    - secure: "C/9/o+5KdTY1LZ4qZGE1+gY6mEGamG/VDHP69Om9dklfchJD6C+j8K8dvmE26FeRnLhSL7eGf1b3m6lfgkTZeVFjjiZE0Exvf1yI9Y3QPWR7ViaFxWk1z1I4HaSu4fpBo++e8FW+0EGjIkIrRtAn+bav3eDpAhgSih10KmAx4a8="
-  matrix:
-    - 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/Cargo.lock b/Cargo.lock
index cd402b9397a..3c9746c4432 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -32,7 +32,7 @@ dependencies = [
  "egl 0.1.0 (git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c31b3e220)",
  "freetype 0.1.0 (git+https://github.com/servo/rust-freetype#0b03da276e4bdeae2300596dabc4ccb16733ad70)",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom#50a294fd997f0c6eb43e9a58ad6e227fdc2a4692)",
- "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#955dbe919870b0536f79123232d87c0efe3c552e)",
+ "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#7ccfaca315a43d97914e1601c90ad348ef190edf)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers#ef89918471815dfced7aaf2f1594d5469f03eab7)",
  "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#6776e9c07feb149d34b087039ecf6b2c143e3afc)",
  "skia-sys 0.0.20130412 (git+https://github.com/servo/skia#6d696712962fd0d41120b7a414a48417da8e6a92)",
@@ -64,7 +64,7 @@ dependencies = [
  "devtools_traits 0.0.1",
  "geom 0.1.0 (git+https://github.com/servo/rust-geom#50a294fd997f0c6eb43e9a58ad6e227fdc2a4692)",
  "gfx 0.0.1",
- "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#955dbe919870b0536f79123232d87c0efe3c552e)",
+ "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#7ccfaca315a43d97914e1601c90ad348ef190edf)",
  "glut 0.0.1 (git+https://github.com/servo/rust-glut#01af0162ea0322ad1a40d6adb023a39813605949)",
  "layers 0.1.0 (git+https://github.com/servo/rust-layers#ef89918471815dfced7aaf2f1594d5469f03eab7)",
  "layout_traits 0.0.1",
@@ -195,7 +195,7 @@ dependencies = [
 [[package]]
 name = "glfw"
 version = "0.0.1"
-source = "git+https://github.com/servo/glfw-rs?ref=servo#955dbe919870b0536f79123232d87c0efe3c552e"
+source = "git+https://github.com/servo/glfw-rs?ref=servo#7ccfaca315a43d97914e1601c90ad348ef190edf"
 dependencies = [
  "glfw-sys 3.0.4 (git+https://github.com/servo/glfw?ref=cargo-3.0.4#65a2b4721276589d9de24f6a9999a2db37286cae)",
  "semver 0.0.1 (git+https://github.com/rust-lang/semver#d04583a173395b76c1eaa15cc630a5f6f8f0ae10)",
diff --git a/etc/ci/upload_docs.sh b/etc/ci/upload_docs.sh
new file mode 100755
index 00000000000..87946622677
--- /dev/null
+++ b/etc/ci/upload_docs.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Helper script to upload docs to doc.servo.org.
+# Requires ghp-import (from pip)
+# GitHub API token must be passed in environment var TOKEN
+
+set -e
+
+mkdir -p target/doc
+cp -R rust/doc/* target/doc/
+cp etc/doc.servo.org/* target/doc/
+./mach doc # After copying rust/doc, so that the crate index is correct
+ghp-import -n target/doc
+git push -qf https://${TOKEN}@github.com/servo/doc.servo.org.git gh-pages
+
diff --git a/support/glfw-rs b/support/glfw-rs
-Subproject 955dbe919870b0536f79123232d87c0efe3c552
+Subproject 7ccfaca315a43d97914e1601c90ad348ef190ed
diff --git a/tests/wpt/run.sh b/tests/wpt/run.sh
index 4aa626730d7..c78f554ffa3 100755
--- a/tests/wpt/run.sh
+++ b/tests/wpt/run.sh
@@ -18,6 +18,10 @@ if [[ $* == *--update-manifest* ]]; then
 fi
 (python -c "import wptrunner"  &>/dev/null) || pip install 'wptrunner==1.0'
 
+# Patch wptrunner to run servo in cpu mode
+sed 's."--hard-fail",."--hard-fail", "-c",.' _virtualenv/lib/python2.7/site-packages/wptrunner/executors/executorservo.py > _virtualenv/lib/python2.7/site-packages/wptrunner/executors/executorservo.py.new
+mv _virtualenv/lib/python2.7/site-packages/wptrunner/executors/executorservo.py.new _virtualenv/lib/python2.7/site-packages/wptrunner/executors/executorservo.py
+
 python $servo_root/tests/wpt/run.py \
   --config $servo_root/tests/wpt/config.ini \
   --binary target/servo \