From fe696eae4cef119b29784ab80ec03d3f4cc089ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20=C5=A0imko?= Date: Thu, 25 Jan 2024 12:35:36 +0100 Subject: [PATCH 1/2] ci(shellcheck): fix exit code propagation (#698) Return properly the exit code status of shellcheck command when looping through shell script files. --- run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.sh b/run-tests.sh index b6ec165b..3942e04b 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -28,7 +28,7 @@ check_commitlint () { } check_shellcheck () { - find . -name "*.sh" -exec shellcheck {} \; + find . -name "*.sh" -exec shellcheck {} \+ } check_black () { From fa5b7c76eb25bfb1591e6fae4a142d975e14b937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20=C5=A0imko?= Date: Thu, 25 Jan 2024 12:35:36 +0100 Subject: [PATCH 2/2] ci(commitlint): check for the presence of concrete PR number (#698) Enrich commitlint checker in order to check the precise PR number in the commit log headline. --- .github/workflows/ci.yml | 2 +- run-tests.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd072f36..3f6e13c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Check commit message compliance of the pull request if: github.event_name == 'pull_request' run: | - ./run-tests.sh --check-commitlint ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} ${{ github.event.pull_request.head.sha }} + ./run-tests.sh --check-commitlint ${{ github.event.pull_request.head.sha }}~${{ github.event.pull_request.commits }} ${{ github.event.pull_request.head.sha }} ${{ github.event.pull_request.number }} lint-shellcheck: runs-on: ubuntu-20.04 diff --git a/run-tests.sh b/run-tests.sh index 3942e04b..c3dc72fc 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -12,13 +12,14 @@ set -o nounset check_commitlint () { from=${2:-master} to=${3:-HEAD} + pr=${4:-[0-9]+} npx commitlint --from="$from" --to="$to" found=0 while IFS= read -r line; do - if echo "$line" | grep -qP "\(\#[0-9]+\)$"; then + if echo "$line" | grep -qP "\(\#$pr\)$"; then true else - echo "✖ PR number missing in $line" + echo "✖ Headline does not end by '(#$pr)' PR number: $line" found=1 fi done < <(git log "$from..$to" --format="%s")