summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2020-05-12 22:03:20 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2020-05-12 22:03:20 +0000
commitbeb8bd54b7de608061592d4145c04b613bc94457 (patch)
treeb3ccc2f9ff480204cc086f58e28c716aca4f7333
parent4851cf7430cf442446ff947015dd3ebd5303e2c8 (diff)
parentad452b146f332ce390c394d76a09803725f99e81 (diff)
downloadgitlab-shell-beb8bd54b7de608061592d4145c04b613bc94457.tar.gz
Merge branch 'sh-add-race-test' into 'master'
Add race testing as separate CI step See merge request gitlab-org/gitlab-shell!383
-rw-r--r--.gitlab-ci.yml6
-rw-r--r--Makefile3
2 files changed, 9 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e351fd1..c9c1744 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,6 +55,12 @@ go:1.14:
extends: .test
image: golang:1.14
+race:
+ extends: .test
+ image: golang:1.14
+ script:
+ - make test_golang_race
+
codequality:
extends: .use-docker-in-docker
allow_failure: true
diff --git a/Makefile b/Makefile
index 4b0ca2c..5c2a8f1 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,9 @@ test_ruby:
test_golang:
go test ./...
+test_golang_race:
+ go test -race ./...
+
setup: _install bin/gitlab-shell
_install: