diff options
author | Christian Couder <chriscool@tuxfamily.org> | 2020-06-02 09:40:11 +0300 |
---|---|---|
committer | Christian Couder <chriscool@tuxfamily.org> | 2020-06-02 09:51:46 +0300 |
commit | 97cad88d8a2a96c89224629547763c8ab05f71d2 (patch) | |
tree | 9436f76b6224e6fd9ca06aa7ec4af8d990a5f9bf | |
parent | 34810c8ca5d2e8ee168d0dcbec39bd7fbc7563c9 (diff) |
Upgrade to Git 2.27
- update Docker base image
- update CI testing matrix
Part of: https://gitlab.com/gitlab-org/gitaly/-/issues/2829
-rw-r--r-- | .gitlab-ci.yml | 26 | ||||
-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-27-0.yml | 5 |
5 files changed, 21 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49780de9a..1be27772b 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.26 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.27 tags: - gitlab-org variables: DOCKER_DRIVER: overlay2 - CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.13-git-2.26 + CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.13-git-2.27 SAST_DISABLE_DIND: "true" SAST_DEFAULT_ANALYZERS: "gosec" @@ -103,36 +103,36 @@ proto: build:go1.14: <<: *build_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.26 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.27 build:go1.13: <<: *build_definition - 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 binaries_go1.14: <<: *assemble_definition - image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.26 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.27 binaries_go1.13: <<: *assemble_definition - 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 + +test:go1.14-git-2.27-ruby-2.6: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.27 + <<: *test_definition 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:go1.13-git-2.27-ruby-2.6: + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.27 <<: *test_definition 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.24 - <<: *test_definition - test:proxy: <<: *test_definition script: @@ -252,7 +252,7 @@ praefect_sql_test: lint: # Only Go 1.13 currently officially supported - 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 stage: test retry: 2 script: diff --git a/Dockerfile b/Dockerfile index 37a57e430..b82f3df34 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.26 +FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.27 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.24.x` and `2.26.x` are supported. +Gitaly uses `git`. Versions `2.26.x` and `2.27.x` are supported. ## Configuration diff --git a/_support/instrumented-cluster/docker-compose.yml b/_support/instrumented-cluster/docker-compose.yml index bde60b474..114a91204 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.26 + image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.14-git-2.27 volumes: - gitalydata1:/repositories - ./gitaly1repos/setup.sh:/setup.sh diff --git a/changelogs/unreleased/cc-git-2-27-0.yml b/changelogs/unreleased/cc-git-2-27-0.yml new file mode 100644 index 000000000..cd70ffd59 --- /dev/null +++ b/changelogs/unreleased/cc-git-2-27-0.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade to Git 2.27 +merge_request: 2237 +author: +type: deprecated |