diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-07-16 12:59:22 +0300 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-07-16 12:59:22 +0300 |
| commit | b1c89ac5e3d52d4b86e149648852871f1a443001 (patch) | |
| tree | 344e0c0b4d91761be1e9c1b692903c38f838ce66 | |
| parent | db2a924d018510a60a1378f75fd7025ac3b5810c (diff) | |
| parent | 7638549b43847e8cc04263b26062646235554a4f (diff) | |
Merge branch 'update-git-to-2-18-0' into 'master'
Update Git to 2.18.0
See merge request gitlab-org/gitaly!795
| -rw-r--r-- | .gitlab-ci.yml | 16 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/update-git-to-2-18-0.yml | 5 |
3 files changed, 18 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c982ab8d..50621dd4f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.17 +image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.18 stages: - build @@ -7,7 +7,7 @@ stages: variables: DOCKER_DRIVER: overlay - CUSTOM_IMAGE_VERSION: ruby-2.4-golang-1.9-git-2.17 + CUSTOM_IMAGE_VERSION: ruby-2.4-golang-1.9-git-2.18 verify: stage: test @@ -75,7 +75,7 @@ danger-review: build:go1.10: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.16 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 build:go1.9: <<: *build_definition @@ -83,7 +83,7 @@ build:go1.9: binaries_go1.10: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.16 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 binaries_go1.9: <<: *assemble_definition @@ -124,6 +124,14 @@ test:go1.10-git2.17-ruby-2.3: <<: *test_definition image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.3-golang-1.10-git-2.17 +test:go1.9-git2.18-ruby-2.4: + <<: *test_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.9-git-2.18 + +test:go1.10-git2.18-ruby-2.4: + <<: *test_definition + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.4-golang-1.10-git-2.18 + race: <<: *go_test_definition script: @@ -62,7 +62,7 @@ Gitaly requires Go 1.8 or newer and Ruby 2.3. Run `make` to download and compile Ruby dependencies, and to compile the Gitaly Go executable. -Gitaly uses `git`. Version `2.14.3` is recommended, and `2.9.0` at a minimum. +Gitaly uses `git`. Version `2.18.0` is recommended, and `2.9.0` at a minimum. ## Configuration diff --git a/changelogs/unreleased/update-git-to-2-18-0.yml b/changelogs/unreleased/update-git-to-2-18-0.yml new file mode 100644 index 000000000..6eeff8340 --- /dev/null +++ b/changelogs/unreleased/update-git-to-2-18-0.yml @@ -0,0 +1,5 @@ +--- +title: Update Git to 2.18.0 +merge_request: 795 +author: +type: added |