[commit: ghc] master: gitlab-ci: Clean up linter (266b49c)
git at git.haskell.org
git at git.haskell.org
Fri Mar 22 22:34:23 UTC 2019
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/266b49ca3f3f8846eae29d984eb04339dbc0c2c5/ghc
>---------------------------------------------------------------
commit 266b49ca3f3f8846eae29d984eb04339dbc0c2c5
Author: Ben Gamari <ben at smart-cactus.org>
Date: Fri Mar 22 18:33:08 2019 -0400
gitlab-ci: Clean up linter
I'm not sure why these steps were done but they seem counterproductive
and unnecessary.
>---------------------------------------------------------------
266b49ca3f3f8846eae29d984eb04339dbc0c2c5
.gitlab-ci.yml | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86d0fde..3c22c60 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:
More information about the ghc-commits
mailing list