diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-03-25 14:38:02 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-03-26 23:40:47 +0300 |
commit | d244a2974c6bb901eceb4c987ff9295336bc9443 (patch) | |
tree | 86eba5ad13b990b730bfbcc400e721cfaad690f8 /.gitlab-ci.yml | |
parent | 159413072e181ef7596b54a63b5ac5f77417d75a (diff) |
Drop support for Golang 1.10
Fixes https://gitlab.com/gitlab-org/gitaly/issues/1516
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c209e345..b0ee4d885 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,10 +86,6 @@ build:go1.11: <<: *build_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 -build:go1.10: - <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 - binaries_go1.12: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.18 @@ -98,10 +94,6 @@ binaries_go1.11: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 -binaries_go1.10: - <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 - test:go1.12-git-2.21-ruby-2.5: image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.21 <<: *test_definition @@ -114,13 +106,9 @@ test:go1.11-git-2.18-ruby-2.5: image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 <<: *test_definition -test:go1.10-git2.18-ruby-2.5: - <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 - test:proxy: <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.10-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 script: - make test-with-proxies |