diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2020-05-21 05:11:03 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2020-05-28 04:10:43 +0300 |
| commit | 1564ca1df0155350d01692eb1a4781cde763edac (patch) | |
| tree | 3566afc3b3c43fd08431335e1107e8d7c7e40068 | |
| parent | 0bfbd56c4de5c74dae1952e107e7b3a60fcdcc88 (diff) | |
Fix odd formatting
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | Makefile.util.mk | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d350f0a..772dbbde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,9 +91,9 @@ cover: extends: .go-mod-cache needs: ['download deps'] script: - - make setup - - make generate-mocks - - make cover + - make setup + - make generate-mocks + - make cover coverage: '/total:.+\(statements\).+\d+\.\d+/' artifacts: paths: @@ -109,10 +109,10 @@ lint: # and print linting issues to stdout in the format: path/to/file:line description - golangci-lint run --out-format code-climate | tee gl-code-quality-report.json | jq -r '.[] | "\(.location.path):\(.location.lines.begin) \(.description)"' artifacts: - reports: + reports: codequality: gl-code-quality-report.json - paths: - - gl-code-quality-report.json + paths: + - gl-code-quality-report.json test:1.12: extends: .tests diff --git a/Makefile.util.mk b/Makefile.util.mk index dfc2c8fd..2d90172a 100644 --- a/Makefile.util.mk +++ b/Makefile.util.mk @@ -5,7 +5,6 @@ GOLANGCI_LINT_IMAGE := registry.gitlab.com/gitlab-org/gitlab-build-images:golang lint: deps-download docker run -v $(PWD):/app -w /app $(GOLANGCI_LINT_IMAGE) \ sh -c "golangci-lint run --out-format code-climate | tee gl-code-quality-report.json | jq -r '.[] | \"\(.location.path):\(.location.lines.begin) \(.description)\"'" -# sh -c "golangci-lint run $(if $V,-v)" test: .GOPATH/.ok gitlab-pages go test $(if $V,-v) $(allpackages) |