diff options
| -rwxr-xr-x | etc/ci/upload_docs.sh | 9 | ||||
| -rw-r--r-- | python/servo/devenv_commands.py | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/etc/ci/upload_docs.sh b/etc/ci/upload_docs.sh index c5f4c727e5a..c46ae829063 100755 --- a/etc/ci/upload_docs.sh +++ b/etc/ci/upload_docs.sh @@ -8,9 +8,12 @@ set -e mkdir -p target/doc ./mach bootstrap-rust -cp -R rust/doc/* target/doc/ +# Ordered so that: +# * etc/doc.servo.org/index.html overwrites $(mach rust-root)/doc/index.html +# * ./mach doc overwrites $(mach rust-root)/doc/search-index.js +cp -R $(./mach rust-root)/doc/* target/doc/ cp etc/doc.servo.org/* target/doc/ -./mach doc # After copying rust/doc, so that the crate index is correct +./mach doc + ghp-import -n target/doc git push -qf https://${TOKEN}@github.com/servo/doc.servo.org.git gh-pages - diff --git a/python/servo/devenv_commands.py b/python/servo/devenv_commands.py index f186427ba4a..199471a6023 100644 --- a/python/servo/devenv_commands.py +++ b/python/servo/devenv_commands.py @@ -33,3 +33,9 @@ class MachCommands(CommandBase): help="Command-line arguments to be passed through to rustc") def rustc(self, params): return subprocess.call(["rustc"] + params, env=self.build_env()) + + @Command('rust-root', + description='Print the path to the root of the Rust compiler', + category='devenv') + def rust_root(self): + print(self.config["tools"]["rust-root"]) |