mirror of
https://github.com/BurntSushi/ripgrep.git
synced 2025-01-19 05:49:14 +02:00
ci: make script names consistent
This commit is contained in:
parent
c0d78240df
commit
52ec68799c
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -170,12 +170,12 @@ jobs:
|
|||||||
|
|
||||||
- name: Test zsh shell completions (Unix, sans cross)
|
- name: Test zsh shell completions (Unix, sans cross)
|
||||||
# We could test this when using Cross, but we'd have to execute the
|
# We could test this when using Cross, but we'd have to execute the
|
||||||
# 'rg' binary (done in test_complete.sh) with qemu, which is a pain and
|
# 'rg' binary (done in test-complete) with qemu, which is a pain and
|
||||||
# doesn't really gain us much. If shell completion works in one place,
|
# doesn't really gain us much. If shell completion works in one place,
|
||||||
# it probably works everywhere.
|
# it probably works everywhere.
|
||||||
if: matrix.target == '' && matrix.os != 'windows-2019'
|
if: matrix.target == '' && matrix.os != 'windows-2019'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: ci/test_complete.sh
|
run: ci/test-complete
|
||||||
|
|
||||||
rustfmt:
|
rustfmt:
|
||||||
name: rustfmt
|
name: rustfmt
|
||||||
|
@ -98,7 +98,7 @@ assets = [
|
|||||||
# The man page is automatically generated by ripgrep's build process, so
|
# The man page is automatically generated by ripgrep's build process, so
|
||||||
# this file isn't actually commited. Instead, to create a dpkg, either
|
# this file isn't actually commited. Instead, to create a dpkg, either
|
||||||
# create a deployment/deb directory and copy the man page to it, or use the
|
# create a deployment/deb directory and copy the man page to it, or use the
|
||||||
# 'ci/build_deb.sh' script.
|
# 'ci/build-deb' script.
|
||||||
["deployment/deb/rg.1", "usr/share/man/man1/rg.1", "644"],
|
["deployment/deb/rg.1", "usr/share/man/man1/rg.1", "644"],
|
||||||
# Similarly for shell completions.
|
# Similarly for shell completions.
|
||||||
["deployment/deb/rg.bash", "usr/share/bash-completion/completions/rg", "644"],
|
["deployment/deb/rg.bash", "usr/share/bash-completion/completions/rg", "644"],
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
D="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
|
||||||
|
|
||||||
# This script builds a binary dpkg for Debian based distros. It does not
|
# This script builds a binary dpkg for Debian based distros. It does not
|
||||||
# currently run in CI, and is instead run manually and the resulting dpkg is
|
# currently run in CI, and is instead run manually and the resulting dpkg is
|
||||||
@ -23,20 +24,12 @@ fi
|
|||||||
# the deb, which knows where to look.
|
# the deb, which knows where to look.
|
||||||
|
|
||||||
DEPLOY_DIR=deployment/deb
|
DEPLOY_DIR=deployment/deb
|
||||||
|
OUT_DIR="$("$D"/cargo-out-dir target/debug/)"
|
||||||
mkdir -p "$DEPLOY_DIR"
|
mkdir -p "$DEPLOY_DIR"
|
||||||
cargo build
|
cargo build
|
||||||
|
|
||||||
# Find and copy man page.
|
# Copy man page and shell completions.
|
||||||
manpage="$(find ./target/debug -name rg.1 -print0 | xargs -0 ls -t | head -n1)"
|
cp "$OUT_DIR"/{rg.1,rg.bash,rg.fish,_rg} "$DEPLOY_DIR/"
|
||||||
cp "$manpage" "$DEPLOY_DIR/"
|
|
||||||
|
|
||||||
# Do the same for shell completions.
|
|
||||||
compbash="$(find ./target/debug -name rg.bash -print0 | xargs -0 ls -t | head -n1)"
|
|
||||||
cp "$compbash" "$DEPLOY_DIR/"
|
|
||||||
compfish="$(find ./target/debug -name rg.fish -print0 | xargs -0 ls -t | head -n1)"
|
|
||||||
cp "$compfish" "$DEPLOY_DIR/"
|
|
||||||
compzsh="complete/_rg"
|
|
||||||
cp "$compzsh" "$DEPLOY_DIR/"
|
|
||||||
|
|
||||||
# Since we're distributing the dpkg, we don't know whether the user will have
|
# Since we're distributing the dpkg, we don't know whether the user will have
|
||||||
# PCRE2 installed, so just do a static build.
|
# PCRE2 installed, so just do a static build.
|
@ -3,7 +3,7 @@
|
|||||||
##
|
##
|
||||||
# zsh completion function for ripgrep
|
# zsh completion function for ripgrep
|
||||||
#
|
#
|
||||||
# Run ci/test_complete.sh after building to ensure that the options supported by
|
# Run ci/test-complete after building to ensure that the options supported by
|
||||||
# this function stay in synch with the `rg` binary.
|
# this function stay in synch with the `rg` binary.
|
||||||
#
|
#
|
||||||
# For convenience, a completion reference guide is included at the bottom of
|
# For convenience, a completion reference guide is included at the bottom of
|
||||||
@ -323,7 +323,7 @@ _rg() {
|
|||||||
'(--type-list)*: :_files'
|
'(--type-list)*: :_files'
|
||||||
)
|
)
|
||||||
|
|
||||||
# This is used with test_complete.sh to verify that there are no options
|
# This is used with test-complete to verify that there are no options
|
||||||
# listed in the help output that aren't also defined here
|
# listed in the help output that aren't also defined here
|
||||||
[[ $_RG_COMPLETE_LIST_ARGS == (1|t*|y*) ]] && {
|
[[ $_RG_COMPLETE_LIST_ARGS == (1|t*|y*) ]] && {
|
||||||
print -rl - $args
|
print -rl - $args
|
||||||
|
Loading…
x
Reference in New Issue
Block a user