diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-04-16 16:49:18 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-04-16 16:53:17 +0300 |
| commit | b7486bd4792a15a8d63e35ba68a607bf9cd449b0 (patch) | |
| tree | 535dabab59f2a8e4ee487d4bf0abc63d7f9815af | |
| parent | 3dab80f2e182c2523080aa7b0a9dddde446f7c2c (diff) | |
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
| -rw-r--r-- | .gitlab-ci.yml | 19 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-git-2-21.yml | 5 |
3 files changed, 13 insertions, 13 deletions
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 @@ -59,7 +59,7 @@ Gitaly requires Go 1.11 or newer and Ruby 2.5. Run `make` to download and compile Ruby dependencies, and to compile the Gitaly Go executable. -Gitaly uses `git`. Version `2.18.0` or higher is required. +Gitaly uses `git`. Version `2.21.0` or higher is required. ## Configuration diff --git a/changelogs/unreleased/zj-git-2-21.yml b/changelogs/unreleased/zj-git-2-21.yml new file mode 100644 index 000000000..0c53c97ab --- /dev/null +++ b/changelogs/unreleased/zj-git-2-21.yml @@ -0,0 +1,5 @@ +--- +title: Test and require Git 2.21 +merge_request: 1205 +author: +type: added |