diff options
| author | Daniel P. Berrangé | 2020-10-21 18:31:34 +0200 |
|---|---|---|
| committer | Alex Bennée | 2020-10-27 10:53:48 +0100 |
| commit | faf9828e2fbb62cb2edaeeaa48449193d952016f (patch) | |
| tree | 6e1ff4b8294967c1fc4b86eb3bc7c52f091f9bd5 | |
| parent | tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1 (diff) | |
| download | qemu-faf9828e2fbb62cb2edaeeaa48449193d952016f.tar.gz qemu-faf9828e2fbb62cb2edaeeaa48449193d952016f.tar.xz qemu-faf9828e2fbb62cb2edaeeaa48449193d952016f.zip | |
gitlab: skip checkpatch.pl checks if no commit delta on branch
If the current branch is synced to the current upstream git master,
there are no commits that need checking. This causes checkpatch.pl
to print an error that it found no commits. We need to avoid calling
checkpatch.pl in this case.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201019143537.283094-2-berrange@redhat.com>
Message-Id: <20201021163136.27324-5-alex.bennee@linaro.org>
| -rwxr-xr-x | .gitlab-ci.d/check-patch.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.gitlab-ci.d/check-patch.py b/.gitlab-ci.d/check-patch.py index 5a14a25b13..0ff30ee077 100755 --- a/.gitlab-ci.d/check-patch.py +++ b/.gitlab-ci.d/check-patch.py @@ -33,8 +33,16 @@ ancestor = subprocess.check_output(["git", "merge-base", ancestor = ancestor.strip() +log = subprocess.check_output(["git", "log", "--format=%H %s", + ancestor + "..."], + universal_newlines=True) + subprocess.check_call(["git", "remote", "rm", "check-patch"]) +if log == "": + print("\nNo commits since %s, skipping checks\n" % ancestor) + sys.exit(0) + errors = False print("\nChecking all commits since %s...\n" % ancestor) |