From 71261cb08e65ad8b33715b01a1e4683d6eebedaf Mon Sep 17 00:00:00 2001
From: Christian Couder <chriscool@tuxfamily.org>
Date: Wed, 3 Jun 2020 11:19:55 +0200
Subject: [PATCH] Get rid of images using Git < 2.25

---
 .gitlab-ci.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 91d565b..a03c5bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,11 +60,9 @@ variables:
 node-10 test: *test_custom
 
 # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
-ruby-2.6-golang-1.13-git-2.24 test: *test_custom
 ruby-2.6-golang-1.13-git-2.25 test: *test_custom
 ruby-2.6-golang-1.13-git-2.26 test: *test_custom
 ruby-2.6-golang-1.13-git-2.27 test: *test_custom
-ruby-2.6-golang-1.14-git-2.24 test: *test_custom
 ruby-2.6-golang-1.14-git-2.25 test: *test_custom
 ruby-2.6-golang-1.14-git-2.26 test: *test_custom
 ruby-2.6-golang-1.14-git-2.27 test: *test_custom
@@ -76,8 +74,8 @@ ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql
 ruby-2.6.6-git-2.26-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34 test: *test_custom
 
 # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
-ruby-2.6.5-git-2.24-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom
-ruby-2.6.5-git-2.24-chrome-83-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom
+ruby-2.6.5-git-2.27-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom
+ruby-2.6.5-git-2.27-chrome-83-node-12.x-yarn-1.21-docker-19.03.1 test: *test_custom
 
 # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
 ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
@@ -119,11 +117,9 @@ golangci-lint-alpine test: *test_build
 node-10: *build_and_deploy_custom
 
 # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
-ruby-2.6-golang-1.13-git-2.24: *build_and_deploy_custom
 ruby-2.6-golang-1.13-git-2.25: *build_and_deploy_custom
 ruby-2.6-golang-1.13-git-2.26: *build_and_deploy_custom
 ruby-2.6-golang-1.13-git-2.27: *build_and_deploy_custom
-ruby-2.6-golang-1.14-git-2.24: *build_and_deploy_custom
 ruby-2.6-golang-1.14-git-2.25: *build_and_deploy_custom
 ruby-2.6-golang-1.14-git-2.26: *build_and_deploy_custom
 ruby-2.6-golang-1.14-git-2.27: *build_and_deploy_custom
@@ -135,8 +131,8 @@ ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql
 ruby-2.6.6-git-2.26-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34: *build_and_deploy_custom
 
 # Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
-ruby-2.6.5-git-2.24-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
-ruby-2.6.5-git-2.24-chrome-83-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
+ruby-2.6.5-git-2.27-chrome-74.0-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
+ruby-2.6.5-git-2.27-chrome-83-node-12.x-yarn-1.21-docker-19.03.1: *build_and_deploy_custom
 
 # Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
 ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom