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 'git-minimum-update' into 'master'

Browse source 
Update minimum git version images to git 2.9.0

See merge request gitlab-org/gitlab-build-images!72
This commit is contained in:
Stan Hu 2018-01-25 20:23:42 +00:00
commit 8ea3d2f229
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
.gitlab-ci.yml
View file

@ -48,12 +48,12 @@ before_script:
# Tests
ruby-2.3-golang-1.9-git-2.14 test: *test_custom
ruby-2.3-golang-1.9-git-2.8 test: *test_custom
ruby-2.3.5-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
golang-1.9-git-2.8.4 test: *test_custom
ruby-2.3-golang-1.9-git-2.9 test: *test_custom
ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
golang-1.9-git-2.9.0 test: *test_custom
golang-1.9-git-2.14 test: *test_custom
node-8.9-chrome-63.0-yarn-1.2 test: *test_custom
node-8.9-chrome-64.0-yarn-1.2 test: *test_custom
www-gitlab-com test: *test_build
gitlab-qa test: *test_build
@ -69,12 +69,12 @@ omnibus-gitlab-xenial test: *test_build
# Builds
ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom
ruby-2.3-golang-1.9-git-2.8: *build_and_deploy_custom
ruby-2.3.5-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.3.6-golang-1.9-git-2.14-chrome-63.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
golang-1.9-git-2.8.4: *build_and_deploy_custom
ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom
ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
golang-1.9-git-2.9.0: *build_and_deploy_custom
golang-1.9-git-2.14: *build_and_deploy_custom
node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom
node-8.9-chrome-64.0-yarn-1.2: *build_and_deploy_custom
www-gitlab-com: *build_and_deploy
gitlab-qa: *build_and_deploy

5
scripts/custom-docker-build
View file

@ -27,6 +27,7 @@ function print_chrome_args() {
61|61.0) CHROME_VERSION=61.0.3163.100-1 ;;
62|62.0) CHROME_VERSION=62.0.3202.89-1 ;;
63|63.0) CHROME_VERSION=63.0.3239.108-1 ;;
64|64.0) CHROME_VERSION=64.0.3282.119-1 ;;
*) echo "Unknown chrome version $1"; exit 1;
esac
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"
@ -43,6 +44,10 @@ function print_git_args() {
GIT_VERSION=2.8.4
GIT_DOWNLOAD_SHA256=626e319f8a24fc0866167ea5f6bf3e2f38f69d6cb2e59e150f13709ca3ebf301
;;
2.9|2.9.0)
GIT_VERSION=2.9.0
GIT_DOWNLOAD_SHA256=bff7560f5602fcd8e37669e0f65ef08c6edc996e4f324e4ed6bb8a84765e30bd
;;
2.13)
GIT_VERSION=2.13.6
GIT_DOWNLOAD_SHA256=cb53e6b388d8d19189933366c1fe5c1ca500e8b227b9e707af39c3d879e41015