diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-03-22 18:33:08 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-03-22 18:33:20 -0400 |
| commit | 266b49ca3f3f8846eae29d984eb04339dbc0c2c5 (patch) | |
| tree | 11598851195e547174ece38c41f707fba9bf6e73 | |
| parent | ab51bee40c82cd552bcf13e24b67d43f3b8d25f3 (diff) | |
| download | haskell-266b49ca3f3f8846eae29d984eb04339dbc0c2c5.tar.gz | |
gitlab-ci: Clean up linter
I'm not sure why these steps were done but they seem counterproductive
and unnecessary.
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86d0fde12a..3c22c60b7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,17 +48,11 @@ ghc-linters: image: "registry.gitlab.haskell.org/ghc/ci-images/linters:$DOCKER_REV" script: - git fetch origin - - git checkout "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" - - git reset --hard "origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" - - echo "$CI_MERGE_REQUEST_ID" - - echo "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" - - echo "$CI_COMMIT_SHA" - base="$(git merge-base $CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_COMMIT_SHA)" - - echo $base + - 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) - .gitlab/linters/check-makefiles.py $base $CI_COMMIT_SHA - - git checkout "$CI_COMMIT_SHA" - .gitlab/linters/check-cpp.py $base $CI_COMMIT_SHA dependencies: [] tags: |