packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Import latest ci-commitmessage-submodules from rpm-ostree 

Especially for https://github.com/coreos/rpm-ostree/pull/2079.
This commit is contained in:
Jonathan Lebon 2020-06-17 10:38:06 -04:00
parent bd9b4ea731
commit eb3fe35b06
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -xeuo pipefail
dn=$(dirname $0)
. ${dn}/libbuild.sh
# Copyright 2017 Colin Walters <walters@verbum.org> # Copyright 2017 Colin Walters <walters@verbum.org>
# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php) # Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php)
@ -13,11 +16,8 @@ set -euo pipefail
# It's very common for people to accidentally change submodules, and having this # It's very common for people to accidentally change submodules, and having this
# requirement is a small hurdle to pass. # requirement is a small hurdle to pass.
# if running under PAPR, use the branch/PR HEAD actually # If passed the commit, use that. Otherwise, just use HEAD.
# being tested rather than the merge sha HEAD=${1:-HEAD}
HEAD=${PAPR_COMMIT:-HEAD}
dn=$(dirname $0)
. ${dn}/libpaprci/libbuild.sh
tmpd=$(mktemp -d) tmpd=$(mktemp -d)
touch ${tmpd}/.tmpdir touch ${tmpd}/.tmpdir
@ -30,8 +30,8 @@ cleanup_tmp() {
trap cleanup_tmp EXIT trap cleanup_tmp EXIT
if ! [ -x /usr/bin/git ]; then if ! [ -x /usr/bin/git ]; then
pkg_upgrade pkg_upgrade
pkg_install git pkg_install git
fi fi
gitdir=$(realpath $(pwd)) gitdir=$(realpath $(pwd))
@ -42,17 +42,34 @@ cp -a ${gitdir} ${tmpd}/workdir
cd ${tmpd}/workdir cd ${tmpd}/workdir
git log --pretty=oneline origin/master..$HEAD | while read logline; do git log --pretty=oneline origin/master..$HEAD | while read logline; do
commit=$(echo ${logline} | cut -f 1 -d ' ') commit=$(echo ${logline} | cut -f 1 -d ' ')
# For merge commits, just check that they're empty (i.e. no conflict
# resolution was needed). Otherwise, let's just error out. Conflicts should
# be resolved by rebasing the PR.
# https://stackoverflow.com/questions/3824050#comment82244548_13956422
if [ "$(git rev-list --no-walk --count --merges ${commit})" -ne 0 ]; then
if [ -n "$(git diff-tree ${commit})" ]; then
echo "error: non-empty git merge: resolve conflicts by rebasing!"
exit 1
fi
echo "Commit ${commit} is an empty merge commit; ignoring..."
continue
fi
git diff --name-only ${commit}^..${commit} > ${tmpd}/diff.txt git diff --name-only ${commit}^..${commit} > ${tmpd}/diff.txt
git log -1 ${commit} > ${tmpd}/log.txt git log -1 ${commit} > ${tmpd}/log.txt
echo "Validating commit for submodules: $commit" echo "Validating commit for submodules: $commit"
sed -e 's,^,# ,' < ${tmpd}/log.txt
git checkout -q "${commit}" git checkout -q "${commit}"
git submodule update --init git submodule update --init
git submodule foreach --quiet 'echo $path'| while read submodule; do git submodule foreach --quiet 'echo $path'| while read submodule; 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
sed -e 's,^,# ,' < ${tmpd}/log.txt
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
fi fi