diff options
| author | John Cai <jcai@gitlab.com> | 2019-10-17 22:16:15 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-10-17 22:16:15 +0300 |
| commit | f74214a0db3657e560db95adc700a065b9a53363 (patch) | |
| tree | e9cf596505908cbcbe344af398a7f2dcbf417baa | |
| parent | 5af614acf4855d78bedbcfe18533bb6e94858506 (diff) | |
| parent | f4c890b4173a1ee9344601be711c6609757ab28b (diff) | |
Merge branch 'zj-go-1.13' into 'master'
Support Go 1.13
Closes #2039
See merge request gitlab-org/gitaly!1557
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | go.mod | 2 |
2 files changed, 16 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b8e68652..6655437a0 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.11-git-2.21 +image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22 stages: - build @@ -7,7 +7,7 @@ stages: variables: DOCKER_DRIVER: overlay2 - CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.11-git-2.18 + CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.13-git-2.22 danger-review: image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger @@ -94,6 +94,10 @@ proto: script: - make proto no-changes +build:go1.13: + <<: *build_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22 + build:go1.12: <<: *build_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21 @@ -102,6 +106,10 @@ build:go1.11: <<: *build_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21 +binaries_go1.13: + <<: *assemble_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22 + binaries_go1.12: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21 @@ -110,6 +118,10 @@ binaries_go1.11: <<: *assemble_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.11-git-2.21 +test:go1.13-git-2.22-ruby-2.6: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22 + <<: *test_definition + test:go1.12-git-2.22-ruby-2.6: image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.22 <<: *test_definition @@ -23,3 +23,5 @@ require ( google.golang.org/grpc v1.24.0 gopkg.in/yaml.v2 v2.2.2 ) + +go 1.13 |