keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ci: Allow submodule bumps from Dependabot

Browse Source 
Tweak the logic in `ci-commitmessage-submodules.sh` to allow Dependabot
bumps.
This commit is contained in:
Jonathan Lebon 2020-01-28 14:52:54 -05:00 committed by OpenShift Merge Robot
parent 30c2444f19
commit a40014f5a7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ci/ci-commitmessage-submodules.sh
View File

@ -53,6 +53,11 @@ git log --pretty=oneline origin/master..$HEAD | while read logline; do
if grep -q -e '^'${submodule} ${tmpd}/diff.txt; then if grep -q -e '^'${submodule} ${tmpd}/diff.txt; then
echo "Commit $commit modifies submodule: $submodule" echo "Commit $commit modifies submodule: $submodule"
expected_match="Update 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 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}" echo "error: Commit message for ${commit} changes a submodule, but does not match regex ${expected_match}"
exit 1 exit 1