diff options
| author | Andrew Gallant <jamslam@gmail.com> | 2018-02-20 19:49:36 -0500 |
|---|---|---|
| committer | Andrew Gallant <jamslam@gmail.com> | 2018-02-20 20:05:55 -0500 |
| commit | cb47be938ec81208d64039a539841a7b0a166794 (patch) | |
| tree | 1932fb1836d4f821705cb9e7fc35425c4f3834f8 | |
| parent | fe9be658f410d2e35c1cfe236a338f95aa03a724 (diff) | |
ci: build man page on ARM cross-compile
This fixes a bug where ripgrep's man page wasn't generated in the ARM
cross-compile build. Mostly, this should just require installing
asciidoc and making sure we test that it actually works.
Fixes #791
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rwxr-xr-x | ci/script.sh | 16 |
2 files changed, 19 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index bd6dd503..f95f29ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,12 @@ matrix: - binutils-arm-linux-gnueabihf - libc6-armhf-cross - libc6-dev-armhf-cross + # For generating man page. + - libxslt1-dev + - asciidoc + - docbook-xsl + - xsltproc + - libxml2-utils # Beta channel. We enable these to make sure there are no regressions in # Rust beta releases. - os: linux @@ -67,6 +73,12 @@ matrix: - binutils-arm-linux-gnueabihf - libc6-armhf-cross - libc6-dev-armhf-cross + # For generating man page. + - libxslt1-dev + - asciidoc + - docbook-xsl + - xsltproc + - libxml2-utils install: ci/install.sh script: ci/script.sh before_deploy: ci/before_deploy.sh diff --git a/ci/script.sh b/ci/script.sh index 4e7feaa4..f513bb12 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -23,6 +23,13 @@ main() { # sanity check the file type file target/"$TARGET"/debug/rg + # Check that we've generated man page and other shell completions. + outdir="$(cargo_out_dir "target/$TARGET/debug")" + file "$outdir/rg.bash" + file "$outdir/rg.fish" + file "$outdir/_rg.ps1" + file "$outdir/rg.1" + # Apparently tests don't work on arm, so just bail now. I guess we provide # ARM releases on a best effort basis? if is_arm; then @@ -32,15 +39,6 @@ main() { # Test that zsh completions are in sync with ripgrep's actual args. "$(dirname "${0}")/test_complete.sh" - # Check that we've generated man page and other shell completions. - outdir="$(cargo_out_dir "target/$TARGET/debug")" - file "$outdir/rg.bash" - file "$outdir/rg.fish" - file "$outdir/_rg.ps1" - # N.B. man page isn't generated on ARM cross-compile, but we gave up - # long before this anyway. - file "$outdir/rg.1" - # Run tests for ripgrep and all sub-crates. cargo test --target "$TARGET" --verbose --all } |