diff options
author | Christian Couder <chriscool@tuxfamily.org> | 2020-03-27 10:56:38 +0300 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-04-08 15:08:15 +0300 |
commit | 04bc91132d3f704b0fe5dba3bc401099362f4bd4 (patch) | |
tree | 710731f5b818c25c2cdfd247948458a9e38138f9 | |
parent | 325c5b9eb3f551112e275cfc1eaa021d6de8b307 (diff) |
Upgrade to Git 2.26
- update Docker base image
- update CI testing matrix
Part of: https://gitlab.com/gitlab-org/gitaly/issues/2497
-rw-r--r-- | .gitlab-ci.yml | 28 | ||||
-rw-r--r-- | Dockerfile | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | _support/instrumented-cluster/docker-compose.yml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/cc-git-2-26-0.yml | 5 |
5 files changed, 26 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7998d861..68885ece5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,13 +4,13 @@ stages: - publish default: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.24 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.26 tags: - gitlab-org variables: DOCKER_DRIVER: overlay2 - CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.13-git-2.24 + CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.13-git-2.26 SAST_DISABLE_DIND: "true" SAST_DEFAULT_ANALYZERS: "gosec" @@ -97,33 +97,41 @@ proto: build:go1.14: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.24 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.26 build:go1.13: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24 binaries_go1.14: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.24 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.26 binaries_go1.13: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24 + +test:go1.14-git-2.26-ruby-2.6: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.26 + <<: *test_definition test:go1.14-git-2.24-ruby-2.6: image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.24 <<: *test_definition -test:go1.13-git-2.21-ruby-2.6: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.21 +test:go1.14-git-2.22-ruby-2.6: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.26 <<: *test_definition -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:go1.13-git-2.26-ruby-2.6: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.26 <<: *test_definition test:go1.13-git-2.24-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.13-git-2.22-ruby-2.6: image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24 <<: *test_definition diff --git a/Dockerfile b/Dockerfile index 8396ea028..37a57e430 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # See the _support/load-cluster/docker-compose.yml for an example of how to use # this image # -FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24 +FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.26 RUN mkdir -p /app/ruby @@ -58,7 +58,7 @@ Gitaly requires Go 1.13.9 or newer and Ruby 2.6. Run `make` to download and compile Ruby dependencies, and to compile the Gitaly Go executable. -Gitaly uses `git`. Versions `2.22.0` and `2.24.0` are supported. +Gitaly uses `git`. Versions `2.24.x` and `2.26.x` are supported. ## Configuration diff --git a/_support/instrumented-cluster/docker-compose.yml b/_support/instrumented-cluster/docker-compose.yml index bcd491740..bde60b474 100644 --- a/_support/instrumented-cluster/docker-compose.yml +++ b/_support/instrumented-cluster/docker-compose.yml @@ -2,7 +2,7 @@ version: "2.4" services: gitaly1repos: - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.26 volumes: - gitalydata1:/repositories - ./gitaly1repos/setup.sh:/setup.sh diff --git a/changelogs/unreleased/cc-git-2-26-0.yml b/changelogs/unreleased/cc-git-2-26-0.yml new file mode 100644 index 000000000..9f0e5cb9e --- /dev/null +++ b/changelogs/unreleased/cc-git-2-26-0.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade to Git 2.26 +merge_request: 1983 +author: +type: deprecated |