Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-03-03 19:26:38 +0300
committerJacob Vosmaer <jacob@gitlab.com>2017-03-03 19:26:38 +0300
commit772910373bb69727c21b16077d387dd3401e0fbc (patch)
treed0f9260c78f9f836da78ede2405a003e5c184e99
parent118b9a4ddea21d15ccbb0465ce595cf386064873 (diff)
Break out 'make verify', avoiding it on Go 1.5
golint needs Go 1.6 or newer.
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--Makefile2
2 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d85e7415..8a3c6e6c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,10 +28,11 @@ test:go1.8:
<<: *test_definition
image: golang:1.8
-notice:
+verify:
stage: test
script:
- make notice-up-to-date
+ - make verify
package:
stage: package
diff --git a/Makefile b/Makefile
index 7dac117c7..1a4f44d5e 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ check-formatting: install-developer-tools
govendor-status: ${BUILD_DIR}/_build install-developer-tools
cd ${PKG_BUILD_DIR} && govendor status
-test: clean-build ${BUILD_DIR}/_build verify
+test: clean-build ${BUILD_DIR}/_build
go test ${PKG}/...
lint: install-developer-tools