diff --git a/.gitlab/ci/cng-images.yml b/.gitlab/ci/cng-images.yml index 3634d83..33bf1a0 100644 --- a/.gitlab/ci/cng-images.yml +++ b/.gitlab/ci/cng-images.yml @@ -2,7 +2,7 @@ .gitlab-cng-matrix: variables: LFS: '2.9' - CHROME: '109' + CHROME: '119' NODE: '18.17' YARN: '1.22' GRAPHICSMAGICK: '1.3.36' diff --git a/.gitlab/ci/e2e.images.yml b/.gitlab/ci/e2e.images.yml index 240b9c0..5b6a62d 100644 --- a/.gitlab/ci/e2e.images.yml +++ b/.gitlab/ci/e2e.images.yml @@ -42,7 +42,7 @@ e2e-chrome: matrix: - RUBY: ['3.0', '3.1', '3.2'] BUNDLER: ['2.4', '2.5'] - CHROME: ['117', '119'] + CHROME: ['119', '120'] # Image used for running full e2e test suite e2e-full: diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml index ddc564e..f41d53b 100644 --- a/.gitlab/ci/gitlab.images.yml +++ b/.gitlab/ci/gitlab.images.yml @@ -45,7 +45,7 @@ gitlab: GOLANG: ['1.19', '1.20', '1.21'] RUST: ['1.73'] NODE: ['18.17'] - CHROME: ['117', '119'] + CHROME: ['119', '120'] # Used by GitLab's compile-production-assets and compile-test-assets jobs gitlab-assets: diff --git a/scripts/install-chrome b/scripts/install-chrome index d5d5f77..244e9cf 100755 --- a/scripts/install-chrome +++ b/scripts/install-chrome @@ -38,16 +38,8 @@ function build_debian() { if [ "${ARCH}" == "amd64" ]; then CHROME_VERSION_BASE=$(echo $CHROME_VERSION | awk -F "." '{print $1 "." $2 "." $3}') CHROME_VERSION_MAJOR=$(echo $CHROME_VERSION | awk -F "." '{print $1}') - - # Chromedriver location has moved starting with v115 - # TODO: Remove once oldest supported version across installs is > 114 - if [ "$CHROME_VERSION_MAJOR" -gt "114" ]; then - CHROME_DRIVER_VERSION=$(curl -q https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_$CHROME_VERSION_BASE) - WEBDRIVER_URL=https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROME_DRIVER_VERSION/linux64/chromedriver-linux64.zip - else - CHROME_DRIVER_VERSION=$(curl -q https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_VERSION_BASE) - WEBDRIVER_URL=https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip - fi + CHROME_DRIVER_VERSION=$(curl -q https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_$CHROME_VERSION_BASE) + WEBDRIVER_URL=https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/$CHROME_DRIVER_VERSION/linux64/chromedriver-linux64.zip wget -q -O chromedriver.zip $WEBDRIVER_URL unzip -j chromedriver.zip -d /usr/local/bin diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 9ab680a..47faa5e 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -84,22 +84,6 @@ function print_rust_args() { # Chromium version can sometimes lag behind so the versions have to be defined separately function print_chrome_args() { case "$1" in - 109|109.0) - CHROME_VERSION=109.0.5414.119-1 - CHROMIUM_VERSION=109.0.5414.74-2 - ;; - 110|110.0) - CHROME_VERSION=110.0.5481.177-1 - CHROMIUM_VERSION=$CHROME_VERSION - ;; - 111|111.0) - 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 - ;; 117|117.0) CHROME_VERSION=117.0.5938.92-1 CHROMIUM_VERSION=117.0.5938.62-1 @@ -108,6 +92,10 @@ function print_chrome_args() { CHROME_VERSION=119.0.6045.159-1 CHROMIUM_VERSION=119.0.6045.159-1 ;; + 120|120.0) + CHROME_VERSION=120.0.6099.199-1 + CHROMIUM_VERSION=120.0.6099.199-1 + ;; *) fail "Unknown chrome version $1" ;; esac printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION"