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 'pokstad1-update-gitaly-images' into 'master'

Browse source 
Update Gitaly build images

See merge request gitlab-org/gitlab-build-images!298
This commit is contained in:
Zeger-Jan van de Weg 2020-06-02 07:10:09 +00:00
commit edb77d457d
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
.gitlab-ci.yml
View file

@ -60,16 +60,14 @@ 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.12-git-2.22 test: *test_custom
ruby-2.6-golang-1.12-git-2.24 test: *test_custom
ruby-2.6-golang-1.12-git-2.26 test: *test_custom
ruby-2.6-golang-1.13-git-2.22 test: *test_custom
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.14-git-2.22 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
@ -121,15 +119,14 @@ 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.12-git-2.22: *build_and_deploy_custom
ruby-2.6-golang-1.12-git-2.24: *build_and_deploy_custom
ruby-2.6-golang-1.12-git-2.26: *build_and_deploy_custom
ruby-2.6-golang-1.13-git-2.22: *build_and_deploy_custom
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.14-git-2.22: *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

8
scripts/custom-docker-build
View file

@ -81,10 +81,18 @@ function print_git_args() {
GIT_VERSION=2.24.3
GIT_DOWNLOAD_SHA256=ef6d1d1de1d7921a54d23d07479bd2766f050d6435cea5d3b5322aa4897cb3d7
;;
2.25)
GIT_VERSION=2.25.4
GIT_DOWNLOAD_SHA256=1b11d0ee481c6735e9f7d81a3576ef0989bde7843cb4adcdef578c0593d279ab
;;
2.26)
GIT_VERSION=2.26.2
GIT_DOWNLOAD_SHA256=e1c17777528f55696815ef33587b1d20f5eec246669f3b839d15dbfffad9c121
;;
2.27)
GIT_VERSION=2.27.0
GIT_DOWNLOAD_SHA256=77ded85cbe42b1ffdc2578b460a1ef5d23bcbc6683eabcafbb0d394dffe2e787
;;
*) echo "Unknown git version $1"; exit 1;
esac