summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Bajao <ebajao@gitlab.com>2020-11-23 07:40:40 +0000
committerPatrick Bajao <ebajao@gitlab.com>2020-11-23 07:40:40 +0000
commit384f3036e3d9c501e29a7ce24ece1e887a14d53a (patch)
tree7bc2693cf9eca58b72e1597dc85a67b313d63058
parentc0dee9008007b8a0f517914e8394dde4331ea81e (diff)
parent6d04e6e7810ba25dc3fe98e247f8571c8789eea9 (diff)
downloadgitlab-shell-384f3036e3d9c501e29a7ce24ece1e887a14d53a.tar.gz
Merge branch 'ashmckenzie/golang-1-15' into 'main'
Add go:1.15 CI job See merge request gitlab-org/gitlab-shell!439
-rw-r--r--.gitlab-ci.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e45639a..8ae65d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,9 +60,16 @@ go:1.14:
- make coverage
coverage: '/\d+.\d+%/'
+go:1.15:
+ extends: .test
+ image: golang:1.15
+ after_script:
+ - make coverage
+ coverage: '/\d+.\d+%/'
+
race:
extends: .test
- image: golang:1.14
+ image: golang:1.15
script:
- make test_golang_race