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

Merge branch 'zj-bump-git-2.22' into 'master'

Browse source 
Bump Git version for Gitaly to 2.22

See merge request gitlab-org/gitlab-build-images!204
This commit is contained in:
Stan Hu 2019-07-08 17:44:43 +00:00
commit ac83e5a4e0
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
.gitlab-ci.yml
View file

@ -56,10 +56,11 @@ before_script:
node-10 test: *test_custom node-10 test: *test_custom
# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
ruby-2.5-golang-1.11-git-2.21 test: *test_custom ruby-2.5-golang-1.11-git-2.22 test: *test_custom
ruby-2.6-golang-1.11-git-2.21 test: *test_custom ruby-2.6-golang-1.11-git-2.22 test: *test_custom
ruby-2.5-golang-1.12-git-2.21 test: *test_custom ruby-2.5-golang-1.12-git-2.22 test: *test_custom
ruby-2.6-golang-1.12-git-2.21 test: *test_custom ruby-2.6-golang-1.12-git-2.22 test: *test_custom
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
@ -104,10 +105,10 @@ gitlab-docs-lint test: *test_build
node-10: *build_and_deploy_custom node-10: *build_and_deploy_custom
# Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
ruby-2.5-golang-1.11-git-2.21: *build_and_deploy_custom ruby-2.5-golang-1.11-git-2.22: *build_and_deploy_custom
ruby-2.6-golang-1.11-git-2.21: *build_and_deploy_custom ruby-2.6-golang-1.11-git-2.22: *build_and_deploy_custom
ruby-2.5-golang-1.12-git-2.21: *build_and_deploy_custom ruby-2.5-golang-1.12-git-2.22: *build_and_deploy_custom
ruby-2.6-golang-1.12-git-2.21: *build_and_deploy_custom ruby-2.6-golang-1.12-git-2.22: *build_and_deploy_custom
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom

4
scripts/custom-docker-build
View file

@ -66,6 +66,10 @@ function print_git_args() {
GIT_VERSION=2.21.0 GIT_VERSION=2.21.0
GIT_DOWNLOAD_SHA256=85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee GIT_DOWNLOAD_SHA256=85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee
;; ;;
2.22)
GIT_VERSION=2.22.0
GIT_DOWNLOAD_SHA256=a4b7e4365bee43caa12a38d646d2c93743d755d1cea5eab448ffb40906c9da0b
;;
*) echo "Unknown git version $1"; exit 1; *) echo "Unknown git version $1"; exit 1;
esac esac