gitlab-ci: Clean up linter
authorBen Gamari <ben@smart-cactus.org>
Fri, 22 Mar 2019 22:33:08 +0000 (18:33 -0400)
committerBen Gamari <ben@smart-cactus.org>
Fri, 22 Mar 2019 22:33:20 +0000 (18:33 -0400)
I'm not sure why these steps were done but they seem counterproductive
and unnecessary.

.gitlab-ci.yml

index 86d0fde..3c22c60 100644 (file)
@@ -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: