NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cc-git-2-27-0-improvements' into 'master'

Browse source 
Fully upgrade to Git 2.27 and remove Git 2.24

See merge request gitlab-org/gitlab-build-images!299
This commit is contained in:
Stan Hu 2020-06-05 20:18:24 +00:00
commit 448b4e4679
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
.gitlab-ci.yml
View file

@ -60,24 +60,22 @@ 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
# Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml
ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
ruby-2.6.6-golang-1.14-git-2.27-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
# Used by GitLab's compile-production-assets and compile-test-assets jobs
ruby-2.6.6-git-2.26-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34 test: *test_custom
ruby-2.6.6-git-2.27-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,24 +117,22 @@ 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
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
ruby-2.6.6-golang-1.14-git-2.26-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
ruby-2.6.6-golang-1.14-git-2.27-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
# Used by GitLab's compile-production-assets and compile-test-assets jobs
ruby-2.6.6-git-2.26-lfs-2.9-node-12.x-yarn-1.21-graphicsmagick-1.3.34: *build_and_deploy_custom
ruby-2.6.6-git-2.27-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