Merge branch 'feature/gitlab-ci' into 'main'

ci: Fix hlint CodeClimate output

See merge request kobjolke_a/annotator!1
This commit is contained in:
Alexander Kobjolke 2023-01-05 13:41:19 +00:00
commit f55a6c71b6
2 changed files with 3 additions and 3 deletions

View file

@ -39,7 +39,7 @@ unit-test-job: # This job runs in the test stage.
- linux - linux
script: script:
- echo "Running unit tests... This will take about 60 seconds." - echo "Running unit tests... This will take about 60 seconds."
- sleep 60 - sleep 1
- echo "Code coverage is 90%" - echo "Code coverage is 90%"
lint-test-job: # This job also runs in the test stage. lint-test-job: # This job also runs in the test stage.

View file

@ -20,8 +20,8 @@ $(BUILDDIR)/bin/annotator: app/Main.hs src/*.hs
watch: watch:
@git ls-files src app Makefile | entr make -s build install @git ls-files src app Makefile | entr make -s build install
lint: lint: builddir
@-hlint -g --cc > $(BUILDDIR)/ci/hlint.report.json hlint lint --git --cc --no-exit-code | tr -d '\0' | jq -s . > $(BUILDDIR)/ci/hlint.report.json
clean: clean:
@rm -rf $(BUILDDIR) @rm -rf $(BUILDDIR)