diff options
| author | Vincent Laporte | 2019-01-29 08:55:20 +0000 |
|---|---|---|
| committer | Vincent Laporte | 2019-01-29 08:55:20 +0000 |
| commit | 1f3536e89b7235aaa0007e8ab7298040407df8ba (patch) | |
| tree | 81917018e39ecd4750ba8d0e77c01dd3fc678281 /dev/tools | |
| parent | 10253b1e744e8075b708a9fe328f49c06bbc3fef (diff) | |
| parent | 95d977bf0b1825b7d822abbdd062cdb8c38051cb (diff) | |
Merge PR #9383: Remove travis
Reviewed-by: Zimmi48
Reviewed-by: vbgl
Diffstat (limited to 'dev/tools')
| -rwxr-xr-x | dev/tools/merge-pr.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/tools/merge-pr.sh b/dev/tools/merge-pr.sh index a27dacc5a7..72e2930386 100755 --- a/dev/tools/merge-pr.sh +++ b/dev/tools/merge-pr.sh @@ -143,7 +143,7 @@ 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") +CI_FILES=(".gitlab-ci.yml" "appveyor.yml") if ! git diff --quiet "$BASE_COMMIT" "$LOCAL_BRANCH_COMMIT" -- "${CI_FILES[@]}" then |