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 'update-git-to-2-18-0' into 'master'

Browse source 
Update Git version to 2.18

See merge request gitlab-org/gitlab-build-images!105
This commit is contained in:
Stan Hu 2018-07-13 15:15:01 +00:00
commit 79cda0fd05
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
.gitlab-ci.yml
View file

@ -57,23 +57,27 @@ ruby-2.3-golang-1.9-git-2.9 test: *test_custom
ruby-2.3-golang-1.9-git-2.14 test: *test_custom
ruby-2.3-golang-1.9-git-2.16 test: *test_custom
ruby-2.3-golang-1.9-git-2.17 test: *test_custom
ruby-2.3-golang-1.9-git-2.18 test: *test_custom
ruby-2.3-golang-1.10-git-2.9 test: *test_custom
ruby-2.3-golang-1.10-git-2.14 test: *test_custom
ruby-2.3-golang-1.10-git-2.16 test: *test_custom
ruby-2.3-golang-1.10-git-2.17 test: *test_custom
ruby-2.3-golang-1.10-git-2.18 test: *test_custom
ruby-2.4-golang-1.9-git-2.9 test: *test_custom
ruby-2.4-golang-1.9-git-2.14 test: *test_custom
ruby-2.4-golang-1.9-git-2.16 test: *test_custom
ruby-2.4-golang-1.9-git-2.17 test: *test_custom
ruby-2.4-golang-1.9-git-2.18 test: *test_custom
ruby-2.4-golang-1.10-git-2.14 test: *test_custom
ruby-2.4-golang-1.10-git-2.16 test: *test_custom
ruby-2.4-golang-1.10-git-2.17 test: *test_custom
ruby-2.4-golang-1.10-git-2.18 test: *test_custom
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
# Not used anymore (?)
golang-1.9-git-2.9.0 test: *test_custom
@ -112,23 +116,27 @@ ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom
ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom
ruby-2.3-golang-1.9-git-2.16: *build_and_deploy_custom
ruby-2.3-golang-1.9-git-2.17: *build_and_deploy_custom
ruby-2.3-golang-1.9-git-2.18: *build_and_deploy_custom
ruby-2.3-golang-1.10-git-2.9: *build_and_deploy_custom
ruby-2.3-golang-1.10-git-2.14: *build_and_deploy_custom
ruby-2.3-golang-1.10-git-2.16: *build_and_deploy_custom
ruby-2.3-golang-1.10-git-2.17: *build_and_deploy_custom
ruby-2.3-golang-1.10-git-2.18: *build_and_deploy_custom
ruby-2.4-golang-1.9-git-2.9: *build_and_deploy_custom
ruby-2.4-golang-1.9-git-2.14: *build_and_deploy_custom
ruby-2.4-golang-1.9-git-2.16: *build_and_deploy_custom
ruby-2.4-golang-1.9-git-2.17: *build_and_deploy_custom
ruby-2.4-golang-1.9-git-2.18: *build_and_deploy_custom
ruby-2.4-golang-1.10-git-2.14: *build_and_deploy_custom
ruby-2.4-golang-1.10-git-2.16: *build_and_deploy_custom
ruby-2.4-golang-1.10-git-2.17: *build_and_deploy_custom
ruby-2.4-golang-1.10-git-2.18: *build_and_deploy_custom
# Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
# Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?)
node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom

4
scripts/custom-docker-build
View file

@ -99,6 +99,10 @@ function print_git_args() {
GIT_VERSION=2.17.1
GIT_DOWNLOAD_SHA256=ec6452f0c8d5c1f3bcceabd7070b8a8a5eea11d4e2a04955c139b5065fd7d09a
;;
2.18)
GIT_VERSION=2.18.0
GIT_DOWNLOAD_SHA256=94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4
;;
*) echo "Unknown git version $1"; exit 1;
esac