diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-03-20 16:28:44 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-03-20 16:40:10 +0300 |
| commit | b0547f77a5d617892e721725224b281bcc47abeb (patch) | |
| tree | 48b66c988df2186b4c5bb768da74db28676cf50b | |
| parent | 2abaf625641391c3216fd66aeda183afb80cfa4e (diff) | |
Support Go 1.14
Personnaly I've been compiling and running Gitaly with this version of
Go since Go 1.14 was released. However, this change adds it to the test
matrix so it's enforced.
Part of: https://gitlab.com/gitlab-org/gitaly/-/issues/2558
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 787efbfbf..8d5d24bf0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24 +image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.24 stages: - build @@ -89,6 +89,10 @@ proto: script: - make proto no-changes +build:go1.14: + <<: *build_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.24 + build:go1.13: <<: *build_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22 @@ -97,6 +101,10 @@ build:go1.12: <<: *build_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21 +binaries_go1.14: + <<: *assemble_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.24 + binaries_go1.13: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22 @@ -105,6 +113,10 @@ binaries_go1.12: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21 +test:go1.14-git-2.21-ruby-2.6: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24 + <<: *test_definition + test:go1.13-git-2.21-ruby-2.6: image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.21 <<: *test_definition |