summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2021-03-15 01:05:09 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2021-03-15 01:05:09 +0000
commitdff2209698bea83dc4ef0b31c3887be7efd34166 (patch)
treec7f00a68e25dfff11e5ab5c5f7a7496eda24f592
parent2cdd633f118307a92e43aac75b49e2a82c026d43 (diff)
parentb49c1d4e477974d28df70e468034e823de0c3da6 (diff)
downloadgitlab-shell-dff2209698bea83dc4ef0b31c3887be7efd34166.tar.gz
Merge branch 'update-golang-versions' into 'main'
Compile against go 1.14-1.16 See merge request gitlab-org/gitlab-shell!458
-rw-r--r--.gitlab-ci.yml15
1 files changed, 9 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc588f4..64ac9c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ workflow:
- if: '$CI_COMMIT_TAG'
default:
- image: golang:1.13
+ image: golang:1.14
tags:
- gitlab-org
@@ -45,10 +45,6 @@ default:
script:
- make verify test
-go:1.13:
- extends: .test
- image: golang:1.13
-
go:1.14:
extends: .test
image: golang:1.14
@@ -63,9 +59,16 @@ go:1.15:
- make coverage
coverage: '/\d+.\d+%/'
+go:1.16:
+ extends: .test
+ image: golang:1.16
+ after_script:
+ - make coverage
+ coverage: '/\d+.\d+%/'
+
race:
extends: .test
- image: golang:1.15
+ image: golang:1.16
script:
- make test_golang_race