Skip to content

Commit 7a7f965

Browse files
committed
Auto merge of #11994 - weihanglo:lockfile, r=epage
ci: check if Cargo.lock is up-to-date
2 parents 60bf28f + 7715010 commit 7a7f965

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ jobs:
3737
# TODO: check every members
3838
- run: cargo clippy -p cargo --lib --no-deps -- -D warnings
3939

40+
# Ensure Cargo.lock is up-to-date
41+
lockfile:
42+
runs-on: ubuntu-latest
43+
steps:
44+
- uses: actions/checkout@v3
45+
- run: rustup update stable && rustup default stable
46+
- run: cargo update -p cargo --locked
47+
4048
test:
4149
runs-on: ${{ matrix.os }}
4250
env:

ci/validate-man.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55

66
cd src/doc
77

8-
changes=$(git status --porcelain)
8+
changes=$(git status --porcelain -- .)
99
if [ -n "$changes" ]
1010
then
1111
echo "git directory must be clean before running this script."
@@ -14,10 +14,10 @@ fi
1414

1515
./build-man.sh
1616

17-
changes=$(git status --porcelain)
17+
changes=$(git status --porcelain -- .)
1818
if [ -n "$changes" ]
1919
then
20-
echo "Detected changes in man pages:"
20+
echo "Detected changes of man pages in src/doc:"
2121
echo "$changes"
2222
echo
2323
echo "Please run './build-man.sh' in the src/doc directory to rebuild the"

0 commit comments

Comments
 (0)