From bf2760d0a155153aab33f1954b904df821d959e3 Mon Sep 17 00:00:00 2001 From: Clemens Beck Date: Tue, 19 Dec 2023 06:31:55 +0000 Subject: [PATCH] Update dependencies for bookworm --- .gitlab/ci/customers.images.yml | 4 ++-- .gitlab/ci/e2e.images.yml | 2 +- .gitlab/ci/gitlab.images.yml | 2 +- .gitlab/ci/kas.images.yml | 2 +- scripts/lib/custom-docker-build | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab/ci/customers.images.yml b/.gitlab/ci/customers.images.yml index 64a1e4d..1c94782 100644 --- a/.gitlab/ci/customers.images.yml +++ b/.gitlab/ci/customers.images.yml @@ -22,7 +22,7 @@ customers: GIT: '2.36' parallel: matrix: - - DOCKER: ['20.10.14', ''] + - DOCKER: ['24.0.7', ''] # Used by customers-gitlab-com qa e2e test: https://gitlab.com/gitlab-org/customers-gitlab-com/-/blob/staging/.gitlab/ci/e2e.gitlab-ci.yml customers-qa-assets: @@ -36,4 +36,4 @@ customers-qa-assets: GIT: '2.36' parallel: matrix: - - DOCKER: ['20.10.14', ''] + - DOCKER: ['24.0.7', ''] diff --git a/.gitlab/ci/e2e.images.yml b/.gitlab/ci/e2e.images.yml index 211b0e8..e1eb024 100644 --- a/.gitlab/ci/e2e.images.yml +++ b/.gitlab/ci/e2e.images.yml @@ -34,7 +34,7 @@ e2e-chrome: matrix: - RUBY: ['3.0', '3.1', '3.2'] BUNDLER: ['2.3', '2.4'] - CHROME: ['113', '117'] + CHROME: ['113', '117', '119'] # 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 ffc7ed0..ddc564e 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: ['113', '117'] + CHROME: ['117', '119'] # Used by GitLab's compile-production-assets and compile-test-assets jobs gitlab-assets: diff --git a/.gitlab/ci/kas.images.yml b/.gitlab/ci/kas.images.yml index 7416444..a52f8a8 100644 --- a/.gitlab/ci/kas.images.yml +++ b/.gitlab/ci/kas.images.yml @@ -15,7 +15,7 @@ gitlab-kas: GOLANG: '1.19' RUST: '1.73' LFS: '2.9' - CHROME: '111' + CHROME: '119' NODE: '18.17' YARN: '1.22' GRAPHICSMAGICK: '1.3.36' diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 96cbb9d..dcda2f6 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -105,8 +105,8 @@ function print_chrome_args() { CHROMIUM_VERSION=117.0.5938.62-1 ;; 119|119.0) - CHROME_VERSION=119.0.6045.105-1 - CHROMIUM_VERSION=119.0.6045.105-1 + CHROME_VERSION=119.0.6045.159-1 + CHROMIUM_VERSION=119.0.6045.159-1 ;; *) fail "Unknown chrome version $1" ;; esac