Skip to content

Commit

Permalink
Auto merge of #11994 - weihanglo:lockfile, r=epage
Browse files Browse the repository at this point in the history
ci: check if Cargo.lock is up-to-date
  • Loading branch information
bors committed Apr 18, 2023
2 parents 60bf28f + 7715010 commit 7a7f965
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ jobs:
# TODO: check every members
- run: cargo clippy -p cargo --lib --no-deps -- -D warnings

# Ensure Cargo.lock is up-to-date
lockfile:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: rustup update stable && rustup default stable
- run: cargo update -p cargo --locked

test:
runs-on: ${{ matrix.os }}
env:
Expand Down
6 changes: 3 additions & 3 deletions ci/validate-man.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e

cd src/doc

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

./build-man.sh

changes=$(git status --porcelain)
changes=$(git status --porcelain -- .)
if [ -n "$changes" ]
then
echo "Detected changes in man pages:"
echo "Detected changes of man pages in src/doc:"
echo "$changes"
echo
echo "Please run './build-man.sh' in the src/doc directory to rebuild the"
Expand Down

0 comments on commit 7a7f965

Please sign in to comment.