Skip to content

Commit 393ce5b

Browse files
committed
Auto merge of #12048 - weihanglo:mdman, r=epage
chore: move build-man workflow away from shell
2 parents 7a90ba1 + 137c82a commit 393ce5b

File tree

12 files changed

+138
-518
lines changed

12 files changed

+138
-518
lines changed

.cargo/config.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[alias]
2-
unpublished = "run --package xtask-unpublished --"
2+
build-man = "run --package xtask-build-man --"
33
stale-label = "run --package xtask-stale-label --"
4+
unpublished = "run --package xtask-unpublished --"

Cargo.lock

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/validate-man.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,25 @@
33

44
set -e
55

6-
cd src/doc
6+
cargo_man="src/doc"
7+
mdman_man="crates/mdman/doc"
78

8-
changes=$(git status --porcelain -- .)
9+
changes=$(git status --porcelain -- $cargo_man $mdman_man)
910
if [ -n "$changes" ]
1011
then
1112
echo "git directory must be clean before running this script."
1213
exit 1
1314
fi
1415

15-
./build-man.sh
16+
cargo build-man
1617

17-
changes=$(git status --porcelain -- .)
18+
changes=$(git status --porcelain -- $cargo_man $mdman_man)
1819
if [ -n "$changes" ]
1920
then
20-
echo "Detected changes of man pages in src/doc:"
21+
echo "Detected changes of man pages:"
2122
echo "$changes"
2223
echo
23-
echo "Please run './build-man.sh' in the src/doc directory to rebuild the"
24-
echo "man pages, and commit the changes."
24+
echo 'Please run `cargo build-man` to rebuild the man pages'
25+
echo "and commit the changes."
2526
exit 1
2627
fi

0 commit comments

Comments
 (0)