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 'go/1.17' into 'master'

Browse source 
Add Go 1.17 to the build images

See merge request gitlab-org/gitlab-build-images!431
This commit is contained in:
Stan Hu 2021-08-20 22:30:50 +00:00
commit b5a4afe94d
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -81,11 +81,15 @@ ruby-2.7-golang-1.15-git-2.31 test: *test_custom
ruby-2.7-golang-1.15-git-2.31-pgbouncer-1.14 test: *test_custom ruby-2.7-golang-1.15-git-2.31-pgbouncer-1.14 test: *test_custom
ruby-2.7-golang-1.16-git-2.31 test: *test_custom ruby-2.7-golang-1.16-git-2.31 test: *test_custom
ruby-2.7-golang-1.16-git-2.31-pgbouncer-1.14 test: *test_custom ruby-2.7-golang-1.16-git-2.31-pgbouncer-1.14 test: *test_custom
ruby-2.7-golang-1.17-git-2.31 test: *test_custom
ruby-2.7-golang-1.17-git-2.31-pgbouncer-1.14 test: *test_custom
ruby-3.0-golang-1.14-git-2.31 test: *test_custom ruby-3.0-golang-1.14-git-2.31 test: *test_custom
ruby-3.0-golang-1.15-git-2.31 test: *test_custom ruby-3.0-golang-1.15-git-2.31 test: *test_custom
ruby-3.0-golang-1.15-git-2.31-pgbouncer-1.14 test: *test_custom ruby-3.0-golang-1.15-git-2.31-pgbouncer-1.14 test: *test_custom
ruby-3.0-golang-1.16-git-2.31 test: *test_custom ruby-3.0-golang-1.16-git-2.31 test: *test_custom
ruby-3.0-golang-1.16-git-2.31-pgbouncer-1.14 test: *test_custom ruby-3.0-golang-1.16-git-2.31-pgbouncer-1.14 test: *test_custom
ruby-3.0-golang-1.17-git-2.31 test: *test_custom
ruby-3.0-golang-1.17-git-2.31-pgbouncer-1.14 test: *test_custom
# Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml
ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 test: *test_custom
@ -172,11 +176,15 @@ ruby-2.7-golang-1.15-git-2.31 push: *build_and_deploy_custom
ruby-2.7-golang-1.15-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom ruby-2.7-golang-1.15-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom
ruby-2.7-golang-1.16-git-2.31 push: *build_and_deploy_custom ruby-2.7-golang-1.16-git-2.31 push: *build_and_deploy_custom
ruby-2.7-golang-1.16-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom ruby-2.7-golang-1.16-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom
ruby-2.7-golang-1.17-git-2.31 push: *build_and_deploy_custom
ruby-2.7-golang-1.17-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom
ruby-3.0-golang-1.14-git-2.31 push: *build_and_deploy_custom ruby-3.0-golang-1.14-git-2.31 push: *build_and_deploy_custom
ruby-3.0-golang-1.15-git-2.31 push: *build_and_deploy_custom ruby-3.0-golang-1.15-git-2.31 push: *build_and_deploy_custom
ruby-3.0-golang-1.15-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom ruby-3.0-golang-1.15-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom
ruby-3.0-golang-1.16-git-2.31 push: *build_and_deploy_custom ruby-3.0-golang-1.16-git-2.31 push: *build_and_deploy_custom
ruby-3.0-golang-1.16-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom ruby-3.0-golang-1.16-git-2.31-pgbouncer-1.14 push: *build_and_deploy_custom
ruby-3.0-golang-1.17-git-2.31 push: *build_and_deploy_custom
ruby-3.0-golang-1.17-git-2.31-pgbouncer-1.14 push: *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.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom ruby-2.7.2.patched-golang-1.14-git-2.31-lfs-2.9-chrome-89-node-14.15-yarn-1.22-postgresql-11-graphicsmagick-1.3.36 push: *build_and_deploy_custom

4
scripts/custom-docker-build
View file

@ -19,6 +19,10 @@ function print_golang_args() {
INSTALL_GOLANG_VERSION=1.16.7 INSTALL_GOLANG_VERSION=1.16.7
GOLANG_DOWNLOAD_SHA256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04 GOLANG_DOWNLOAD_SHA256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
;; ;;
1.17)
INSTALL_GOLANG_VERSION=1.17
GOLANG_DOWNLOAD_SHA256=6bf89fc4f5ad763871cf7eac80a2d594492de7a818303283f1366a7f6a30372d
;;
*) echo "Unknown golang version $1"; exit 1; *) echo "Unknown golang version $1"; exit 1;
esac esac