diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2018-06-17 10:34:55 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2018-06-17 10:34:55 +0200 |
| commit | dfbfa6abc74199d88747430bdfc78f6ebda09dcb (patch) | |
| tree | 7e8a78204e44c1063642e23f2bec3d34b61420ed /dev | |
| parent | 256ef64f9c8842ed547ee5e0521804a0c408a7f3 (diff) | |
| parent | a070ba052dd097f6fdb433e8f74b8bdd90d3d7c4 (diff) | |
Merge PR #7752: [merge script] Check if the CI that was run is outdated.
Diffstat (limited to 'dev')
| -rwxr-xr-x | dev/tools/merge-pr.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/dev/tools/merge-pr.sh b/dev/tools/merge-pr.sh index 00d04e6b3..320ef6ed0 100755 --- a/dev/tools/merge-pr.sh +++ b/dev/tools/merge-pr.sh @@ -140,6 +140,24 @@ if [ "$LOCAL_BRANCH_COMMIT" != "$UPSTREAM_COMMIT" ]; then fi fi +# Sanity check: PR has an outdated version of CI + +BASE_COMMIT=$(echo "$PRDATA" | jq -r '.base.sha') +CI_FILES=(".travis.yml" ".gitlab-ci.yml" "appveyor.yml") + +if ! git diff --quiet "$BASE_COMMIT" "$LOCAL_BRANCH_COMMIT" -- "${CI_FILES[@]}" +then + warning "This PR didn't run with the latest version of CI." + warning "It is probably a good idea to ask for a rebase." + read -p "Do you want to see the diff? [Y/n] " $QUICK_CONF -r + echo + if [[ ! $REPLY =~ ^[Nn]$ ]] + then + git diff "$BASE_COMMIT" "$LOCAL_BRANCH_COMMIT" -- "${CI_FILES[@]}" + fi + ask_confirmation +fi + # Sanity check: CI failed STATUS=$(curl -s "$API/commits/$COMMIT/status") |