diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2018-03-01 00:51:27 +0300 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2018-03-01 00:51:27 +0300 |
| commit | 59d322dfc3152e4e4e8a63ca5d5a1a7118985ee8 (patch) | |
| tree | d21724fa84c1d04a9e2104f58a4e0305afd217d8 /.gitlab-ci.yml | |
| parent | 91ed4c266875605c1b1c21aea080b0952b2d6631 (diff) | |
| parent | fc60f26d811eb45512d4b8d3de6b6c24f45dcdd7 (diff) | |
Merge branch 'sh-bump-git-2.16' into 'master'
Add .gitlab-ci.yml tests for Git v2.16
See merge request gitlab-org/gitaly!607
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f032950d0..9dd92f571 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,11 +62,11 @@ verify: build:go1.10: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.14 - + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.16 + build:go1.9: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.14 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.16 build:go1.8: <<: *build_definition @@ -74,15 +74,15 @@ build:go1.8: binaries_go1.10: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.14 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.16 binaries_go1.9: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.14 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.16 binaries_go1.8: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.8.6-git-2.14 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.8.6-git-2.16 test:default: <<: *test_definition @@ -103,6 +103,14 @@ test:go1.10-git2.14: <<: *test_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.14 +test:go1.9-git2.16: + <<: *test_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.9-git-2.16 + +test:go1.10-git2.16: + <<: *test_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.16 + cover: <<: *ruby_definition stage: test |