From b7486bd4792a15a8d63e35ba68a607bf9cd449b0 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Tue, 16 Apr 2019 15:49:18 +0200 Subject: Test and require Git 2.21 Prior to this change, Git 2.18 was the minimal version GitLab required. This commit will require 2.21. This allows GitLab to leverage newer Git features. Part of: https://gitlab.com/gitlab-org/gitlab-ce/issues/54255 --- .gitlab-ci.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 475da7c38..9c406b0b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 +image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.21 stages: - build @@ -80,35 +80,30 @@ verify: build:go1.12: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.21 build:go1.11: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.21 binaries_go1.12: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.21 binaries_go1.11: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.21 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 -test:go1.12-git-2.18-ruby-2.5: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.12-git-2.18 - <<: *test_definition - -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:go1.11-git-2.21-ruby-2.5: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.21 <<: *test_definition test:proxy: <<: *test_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.5-golang-1.11-git-2.18 script: - make test-with-proxies -- cgit v1.2.3