From a40014f5a74e4e275ea4e3f385220de0359ddb95 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 28 Jan 2020 14:52:54 -0500 Subject: [PATCH] ci: Allow submodule bumps from Dependabot Tweak the logic in `ci-commitmessage-submodules.sh` to allow Dependabot bumps. --- ci/ci-commitmessage-submodules.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/ci-commitmessage-submodules.sh b/ci/ci-commitmessage-submodules.sh index 28c4d91d..08374f15 100755 --- a/ci/ci-commitmessage-submodules.sh +++ b/ci/ci-commitmessage-submodules.sh @@ -53,6 +53,11 @@ git log --pretty=oneline origin/master..$HEAD | while read logline; do if grep -q -e '^'${submodule} ${tmpd}/diff.txt; then echo "Commit $commit modifies submodule: $submodule" expected_match="Update submodule: $submodule" + # check if it's from dependabot + if grep -q -e '^Author: dependabot' ${tmpd}/log.txt; then + echo "Commit $commit contains bump from Dependabot" + continue + fi if ! grep -q -e "$expected_match" ${tmpd}/log.txt; then echo "error: Commit message for ${commit} changes a submodule, but does not match regex ${expected_match}" exit 1