From 7f6b6c42e7ff4037277055e0ec9668b7728db6c7 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Aug 18 2024 11:57:40 +0000 Subject: Fix check-valid-tutorial-pr The check for added and removed lines was faulty, because its expected output used space characters instead of tabs like Git actually outputs. Fix that, and also add `--staged` to `git diff` invocations to make the script a bit easier to test locally. --- diff --git a/ci/check-valid-tutorial-pr b/ci/check-valid-tutorial-pr index c33f17f..e24acfd 100755 --- a/ci/check-valid-tutorial-pr +++ b/ci/check-valid-tutorial-pr @@ -1,9 +1,10 @@ #!/usr/bin/bash -DIFF=$(git diff --numstat origin/main) -if [ "$DIFF" != "1 0 share/packagers" ]; then +DIFF=$(git diff --staged --numstat origin/main) +EXPECTED="1 0 share/packagers" +if [ "$DIFF" != "$EXPECTED" ]; then echo -e \ "Not a valid tutorial PR." \ "Expected single added line in 'share/packagers'." \ - "Changes in:\n$(git diff --stat origin/main)" + "Changes in:\n$(git diff --staged --stat origin/main)" exit 1 fi