NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'bump-chrome' into 'master'

Browse source 
Add chrome 113 version

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/686

Merged-by: Rémy Coutable <remy@rymai.me>
Approved-by: Rémy Coutable <remy@rymai.me>
Reviewed-by: Rémy Coutable <remy@rymai.me>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>
This commit is contained in:
Rémy Coutable 2023-05-24 08:45:46 +00:00
commit d686506684
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@ e2e-chrome:
matrix:
- RUBY: ['2.7', '3.0', '3.1', '3.2']
BUNDLER: ['2.3', '2.4']
CHROME: ['109', '110']
CHROME: ['110', '113']
# Image used for running full e2e test suite
e2e-full:

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

@ -29,7 +29,7 @@ gitlab:
GOLANG: ['1.19', '1.20']
RUST: ['1.65']
NODE: ['16.14', '18.16']
CHROME: ['109']
CHROME: ['109', '113']
# Used by GitLab's compile-production-assets and compile-test-assets jobs
gitlab-assets:

4
scripts/lib/custom-docker-build
View file

@ -90,6 +90,10 @@ function print_chrome_args() {
CHROME_VERSION=111.0.5563.64-1
CHROMIUM_VERSION=$CHROME_VERSION
;;
113|113.0)
CHROME_VERSION=113.0.5672.126-1
CHROMIUM_VERSION=$CHROME_VERSION
;;
*) fail "Unknown chrome version $1" ;;
esac
printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"