diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-01-24 16:25:31 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-01-24 16:25:31 +0000 |
| commit | 6e085eea531f77b341d9635f6e4dd2ba535a371f (patch) | |
| tree | 1132bae4cfe9174474b2bf2ac13355defcde0c79 /.gitlab-ci.yml | |
| parent | 61c51d3b6edd44750cb77a87406d2ff7c79a5053 (diff) | |
| parent | 0152cb0dd413b30b9473741959fac92ac1742a78 (diff) | |
| download | gitlab-ce-6e085eea531f77b341d9635f6e4dd2ba535a371f.tar.gz | |
Merge branch 'sh-bump-chrome-golang-ci-image' into 'master'
Bump CI image to use Chrome 71.0 and Golang 1.11
Closes #56614 and #55578
See merge request gitlab-org/gitlab-ce!24572
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d19a4002fad..16c56747711 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.9-git-2.18-chrome-69.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29" +image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-golang-1.11-git-2.18-chrome-71.0-node-10.x-yarn-1.12-postgresql-9.6-graphicsmagick-1.3.29" .dedicated-runner: &dedicated-runner retry: 1 @@ -627,7 +627,7 @@ gitlab:setup-mysql: # Frontend-related jobs gitlab:assets:compile: <<: *dedicated-no-docs-pull-cache-job - image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-69.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 + image: dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.5.3-git-2.18-chrome-71.0-node-8.x-yarn-1.12-graphicsmagick-1.3.29-docker-18.06.1 dependencies: [] services: - docker:stable-dind |