diff options
| author | Philip Withnall <withnall@endlessm.com> | 2019-11-28 11:44:24 +0000 |
|---|---|---|
| committer | Philip Withnall <withnall@endlessm.com> | 2019-11-28 11:47:48 +0000 |
| commit | 805dc2ae937e3116d20e00d1a257565472eee5ef (patch) | |
| tree | 24be123e6a1c4330049421d0724b600a2c6fbf23 | |
| parent | 95b8c1c697ecb8f01628491b1d052f2edfc48bc2 (diff) | |
| download | glib-805dc2ae937e3116d20e00d1a257565472eee5ef.tar.gz | |
ci: Move style-check-diff commands out to a separate sh file
This doesn’t change how they run, but does split the code out a bit and
mean we can interleave it with comments. Should make it a little less
vile.
Suggested by Emmanuele Bassi; see !1252.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/run-style-check-diff.sh | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56a12e92b..ba75de770 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,9 +26,7 @@ style-check-diff: stage: style-check allow_failure: true script: - - git remote add upstream https://gitlab.gnome.org/GNOME/glib.git - - git fetch upstream - - git diff -U0 --no-color $(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}) <(git rev-list --first-parent HEAD) | head -1) | ./clang-format-diff.py -binary "clang-format-7" -p1 + - .gitlab-ci/run-style-check-diff.sh fedora-x86_64: extends: .only-default diff --git a/.gitlab-ci/run-style-check-diff.sh b/.gitlab-ci/run-style-check-diff.sh new file mode 100755 index 000000000..4ed6284b6 --- /dev/null +++ b/.gitlab-ci/run-style-check-diff.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +set +e + +# We need to add a new remote for the upstream master, since this script could +# be running in a personal fork of the repository which has out of date branches. +git remote add upstream https://gitlab.gnome.org/GNOME/glib.git +git fetch upstream + +# Work out the newest common ancestor between the detached HEAD that this CI job +# has checked out, and the upstream target branch (which will typically be +# `upstream/master` or `upstream/glib-2-62`). +# `${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}` is only defined if we’re running in +# a merge request pipeline; fall back to `${CI_DEFAULT_BRANCH}` otherwise. +newest_common_ancestor_sha=$(diff --old-line-format='' --new-line-format='' <(git rev-list --first-parent upstream/${CI_MERGE_REQUEST_TARGET_BRANCH_NAME:-${CI_DEFAULT_BRANCH}}) <(git rev-list --first-parent HEAD) | head -1) +git diff -U0 --no-color "${newest_common_ancestor_sha}" | ./clang-format-diff.py -binary "clang-format-7" -p1 |