summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Bajao <ebajao@gitlab.com>2021-08-12 03:02:19 +0000
committerPatrick Bajao <ebajao@gitlab.com>2021-08-12 03:02:19 +0000
commitfa9e9ad01c410fc47f751e7aef2202928ac1a3ee (patch)
treee70bb0b3a047968356b1a3a13e2bbf665baaaeb6
parent7b44ce1d4a0716d27acabb4f826eb5613dade082 (diff)
parent32a6338de6ec633e6f677a60f247487c29aa33fe (diff)
downloadgitlab-shell-fa9e9ad01c410fc47f751e7aef2202928ac1a3ee.tar.gz
Merge branch 'bump/go1.15' into 'main'
build: bump go to 1.15 See merge request gitlab-org/gitlab-shell!505
-rw-r--r--.gitlab-ci.yml7
-rw-r--r--go.mod2
-rw-r--r--go.sum1
3 files changed, 1 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f8dca5..5ef8a84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,13 +52,6 @@ default:
script:
- make verify test
-go:1.14:
- extends: .test
- image: golang:1.14
- after_script:
- - make coverage
- coverage: '/\d+.\d+%/'
-
go:1.15:
extends: .test
image: golang:1.15
diff --git a/go.mod b/go.mod
index 7c135f8..dcf9551 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitlab-shell
-go 1.13
+go 1.15
require (
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
diff --git a/go.sum b/go.sum
index 33da550..301854c 100644
--- a/go.sum
+++ b/go.sum
@@ -219,7 +219,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=