ci: Add a check that submodule changes include "Update submodule: "

To prevent repeats of https://github.com/ostreedev/ostree/pull/693

I tested this script in https://github.com/cgwalters/playground/pull/48

Closes: #770
Approved by: jlebon
This commit is contained in:
Colin Walters 2017-03-30 16:47:57 -04:00 committed by Atomic Bot
parent 9016e9e8be
commit b74e4e79cc
3 changed files with 52 additions and 0 deletions

View File

@ -2,6 +2,7 @@ FROM fedora:25
RUN dnf install -y \
gcc \
git \
sudo \
which \
attr \

View File

@ -11,6 +11,7 @@ container:
packages:
- libasan
- git
- coccinelle
env:
@ -27,6 +28,7 @@ build:
tests:
- make syntax-check
- ./tests/ci-commitmessage-submodules.sh
- make check
- gnome-desktop-testing-runner -p 0 ostree

View File

@ -0,0 +1,49 @@
#!/bin/bash
set -euo pipefail
# Copyright 2017 Colin Walters <walters@verbum.org>
# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
# This script is intended to be used as a CI gating check
# that if a submodule is changed, the commit message contains
# the text:
#
# Update submodule: submodulepath
#
# It's very common for people to accidentally change submodules, and having this
# requirement is a small hurdle to pass.
tmpd=$(mktemp -d)
touch ${tmpd}/.tmpdir
cleanup_tmp() {
# This sanity check ensures we don't delete something else
if test -f ${tmpd}/.tmpdir; then
rm -rf ${tmpd}
fi
}
trap cleanup_tmp EXIT
gitdir=$(pwd)
# Create a temporary copy of this (using cp not git clone) so git doesn't
# try to read the submodules from the Internet again. If we wanted to
# require a newer git, we could use `git worktree`.
cp -a ${gitdir} ${tmpd}/workdir
cd ${tmpd}/workdir
git log --pretty=oneline origin/master.. | while read logline; do
commit=$(echo ${logline} | cut -f 1 -d ' ')
git diff --name-only ${commit}^..${commit} > ${tmpd}/diff.txt
git log -1 ${commit} > ${tmpd}/log.txt
echo "Validating commit for submodules: $commit"
git checkout -q "${commit}"
git submodule update --init
git submodule foreach --quiet 'echo $path'| while read submodule; do
if grep -q -e '^'${submodule} ${tmpd}/diff.txt; then
echo "Commit $commit modifies submodule: $submodule"
expected_match="Update submodule: $submodule"
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
fi
echo "Verified commit $commit matches regexp ${expected_match}"
fi
done
done