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 'add-chrome-94-support' into 'master'

Browse source 
Add support for Chrome 94 in GitLab images

See merge request gitlab-org/gitlab-build-images!504
This commit is contained in:
Stan Hu 2022-03-21 15:58:00 +00:00
commit b48bd1af38
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitlab/ci/gitlab.images.yml
View file

@ -2,7 +2,6 @@
.gitlab-matrix: .gitlab-matrix:
variables: variables:
LFS: '2.9' LFS: '2.9'
CHROME: '99'
YARN: '1.22' YARN: '1.22'
GRAPHICSMAGICK: '1.3.36' GRAPHICSMAGICK: '1.3.36'
parallel: parallel:
@ -13,6 +12,7 @@
POSTGRESQL: ['11', '12', '13'] POSTGRESQL: ['11', '12', '13']
GOLANG: ['1.16', '1.17'] GOLANG: ['1.16', '1.17']
NODE: ['14.15', '16.14'] NODE: ['14.15', '16.14']
CHROME: ['94', '99']
gitlab test: gitlab test:
extends: extends:

4
scripts/custom-docker-build
View file

@ -40,6 +40,10 @@ function print_chrome_args() {
CHROME_VERSION=89.0.4389.90-1 CHROME_VERSION=89.0.4389.90-1
CHROME_DRIVER_VERSION=89.0.4389.23 CHROME_DRIVER_VERSION=89.0.4389.23
;; ;;
94|94.0)
CHROME_VERSION=94.0.4606.81-1
CHROME_DRIVER_VERSION=94.0.4606.113
;;
97|97.0) 97|97.0)
CHROME_VERSION=97.0.4692.99-1 CHROME_VERSION=97.0.4692.99-1
CHROME_DRIVER_VERSION=97.0.4692.71 CHROME_DRIVER_VERSION=97.0.4692.71