diff options
| author | Andrew Gallant <jamslam@gmail.com> | 2018-08-03 17:26:22 -0400 |
|---|---|---|
| committer | Andrew Gallant <jamslam@gmail.com> | 2018-08-20 07:10:19 -0400 |
| commit | bb110c1ebeeda452046830b3991f705f5759da92 (patch) | |
| tree | cc2b0112a3ca9b8d05cf1e953553907d71564082 /ci | |
| parent | d9ca5293569efb255608d3c601107bcfe7060f15 (diff) | |
ripgrep: migrate to libripgrep
This commit does the work to delete the old `grep` crate and effectively
rewrite most of ripgrep core to use the new libripgrep crates. The new
`grep` crate is now a facade that collects the various crates that make
up libripgrep.
The most complex part of ripgrep core is now arguably the translation
between command line parameters and the library options, which is
ultimately where we want to be.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/before_deploy.sh | 6 | ||||
| -rwxr-xr-x | ci/script.sh | 8 | ||||
| -rw-r--r-- | ci/utils.sh | 7 |
3 files changed, 11 insertions, 10 deletions
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh index 7ee824ec..68f80bdf 100755 --- a/ci/before_deploy.sh +++ b/ci/before_deploy.sh @@ -8,7 +8,11 @@ set -ex # Generate artifacts for release mk_artifacts() { - cargo build --target "$TARGET" --release + if is_arm; then + cargo build --target "$TARGET" --release + else + cargo build --target "$TARGET" --release --features 'pcre2' + fi } mk_tarball() { diff --git a/ci/script.sh b/ci/script.sh index f513bb12..d1799e29 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -8,7 +8,11 @@ set -ex main() { # Test a normal debug build. - cargo build --target "$TARGET" --verbose --all + if is_arm; then + cargo build --target "$TARGET" --verbose + else + cargo build --target "$TARGET" --verbose --all --features 'pcre2' + fi # Show the output of the most recent build.rs stderr. set +x @@ -40,7 +44,7 @@ main() { "$(dirname "${0}")/test_complete.sh" # Run tests for ripgrep and all sub-crates. - cargo test --target "$TARGET" --verbose --all + cargo test --target "$TARGET" --verbose --all --features 'pcre2' } main diff --git a/ci/utils.sh b/ci/utils.sh index 2fb7fadb..1cf2b6dc 100644 --- a/ci/utils.sh +++ b/ci/utils.sh @@ -55,13 +55,6 @@ gcc_prefix() { esac } -is_ssse3_target() { - case "$(architecture)" in - amd64) return 0 ;; - *) return 1 ;; - esac -} - is_x86() { case "$(architecture)" in amd64|i386) return 0 ;; |