diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-03-22 18:49:34 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-03-22 18:49:34 -0400 |
| commit | 971f4530004868b9a043252d6f25081388d99e0d (patch) | |
| tree | b265397b24bc7904aa0947dd9415d9b228547937 | |
| parent | 44b08ede3f4afb05a55c1acd5b644a38e0fb14f5 (diff) | |
| download | haskell-971f4530004868b9a043252d6f25081388d99e0d.tar.gz | |
gitlab-ci: Compute merge base against remote tracking branch
Previously we would use the local branch with the name
`$CI_MERGE_REQUEST_TARGET_BRANCH_NAME` to compute the merge base when
linting. However, this branch isn't necessarily up-to-date. We should
rather use `origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME`.
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01fcc6a20f..f22354a3f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ ghc-linters: image: "registry.gitlab.haskell.org/ghc/ci-images/linters:$DOCKER_REV" script: - git fetch origin - - base="$(git merge-base $CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_COMMIT_SHA)" + - base="$(git merge-base origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_COMMIT_SHA)" - "echo Merge base $base" # - validate-commit-msg .git $(git rev-list $base..$CI_COMMIT_SHA) - validate-whitespace .git $(git rev-list $base..$CI_COMMIT_SHA) |