diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml index 1f10cc3..156ce92 100644 --- a/.github/workflows/compliance.yml +++ b/.github/workflows/compliance.yml @@ -33,15 +33,14 @@ jobs: fetch-depth: 1 - name: REUSE Compliance Check - uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 #v5.0.0 + uses: fsfe/reuse-action@676e2d560c9a403aa252096d99fcab3e1132b0f5 #v6.0.0 CheckSignedOffCommit: if: > github.event_name == 'push' && - !startsWith(github.actor, 'dependabot') && - github.event.pusher.name != 'web-flow' && - github.event.pusher.name != 'github-actions[bot]' && - github.event.pusher.name != 'github-merge-queue[bot]' + !contains(github.actor, '[bot]') && + !contains(github.event.pusher.name, '[bot]') && + github.event.pusher.name != 'web-flow' runs-on: ubuntu-latest permissions: contents: read @@ -81,6 +80,15 @@ jobs: while read -r sha do [ -n "$sha" ] || continue + + # Skip commits from bots + committer_name=`git log --format=%cn -n 1 "$sha"` + if echo "$committer_name" | grep -Fq '[bot]' || [ "$committer_name" = "web-flow" ] + then + echo "Skipping bot/web-flow commit $sha from $committer_name" + continue + fi + msg=`git log --format=%B -n 1 "$sha"` if ! printf '%s' "$msg" | grep -Eqi '^[[:space:]]*Signed[- ]off[- ]by:' @@ -136,6 +144,15 @@ jobs: while read -r sha do [ -n "$sha" ] || continue + + # Skip commits from bots + committer_name=`git log --format=%cn -n 1 "$sha"` + if echo "$committer_name" | grep -Fq '[bot]' || [ "$committer_name" = "web-flow" ] + then + echo "Skipping bot/web-flow commit $sha from $committer_name" + continue + fi + msg=`git log --format=%B -n 1 "$sha"` if ! printf '%s' "$msg" | grep -Eqi '^[[:space:]]*Signed[- ]off[- ]by:'