summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2020-07-22 07:12:51 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2020-07-22 07:12:51 +0000
commitd89ee570533367f8c3e90fe65b4fd04d9f8ecccb (patch)
tree2f0c5c14838b1e49131a49359c7675eda8d45024
parentb3f6fcdb77a3d047ce8b02e9a0faf32e5a244c92 (diff)
parent283848eebe70be8bc0c71cd2a4aea727c6dc26ec (diff)
downloadgitlab-shell-d89ee570533367f8c3e90fe65b4fd04d9f8ecccb.tar.gz
Merge branch 'sh-drop-go-1.12' into 'master'
Drop Go v1.12 support See merge request gitlab-org/gitlab-shell!401
-rw-r--r--.gitlab-ci.yml6
1 files changed, 1 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0186f0..7c19c34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ workflow:
- if: '$CI_COMMIT_TAG'
default:
- image: golang:1.12
+ image: golang:1.13
tags:
- gitlab-org
@@ -46,10 +46,6 @@ default:
script:
- make verify test
-go:1.12:
- extends: .test
- image: golang:1.12
-
go:1.13:
extends: .test
image: golang:1.13