diff --git a/.gitlab/ci/e2e.images.yml b/.gitlab/ci/e2e.images.yml index da7915f..761c2ee 100644 --- a/.gitlab/ci/e2e.images.yml +++ b/.gitlab/ci/e2e.images.yml @@ -33,7 +33,7 @@ e2e-chrome: parallel: matrix: - RUBY: ['2.7', '3.0'] - CHROME: ['106', '108'] + CHROME: ['106', '109'] # Image used for running full e2e test suite e2e-full: diff --git a/Dockerfile.custom b/Dockerfile.custom index b7a9adf..8be9021 100644 --- a/Dockerfile.custom +++ b/Dockerfile.custom @@ -42,8 +42,9 @@ RUN if [ -n "$GIT_VERSION" ]; then /scripts/install-git && git --version; fi # Chrome ARG CHROME_VERSION +ARG CHROMIUM_VERSION -RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome "$CHROME_VERSION"; fi +RUN if [ -n "$CHROME_VERSION" ]; then /scripts/install-chrome "$CHROME_VERSION" "$CHROMIUM_VERSION"; fi # NodeJS and Yarn ARG NODE_INSTALL_VERSION diff --git a/scripts/install-chrome b/scripts/install-chrome index 12d4b37..59a3d2e 100755 --- a/scripts/install-chrome +++ b/scripts/install-chrome @@ -4,29 +4,25 @@ set -xeuo pipefail IFS=$'\n\t' function download_noto() { - local NOTO_VERSION - # https://github.com/googlefonts/noto-emoji/releases/tag/v2.038 - NOTO_VERSION="v2.038" - curl --silent -O --location --fail "https://github.com/googlefonts/noto-emoji/raw/${NOTO_VERSION}/fonts/NotoColorEmoji.ttf" - echo "NotoColorEmoji.ttf" + local NOTO_VERSION + # https://github.com/googlefonts/noto-emoji/releases/tag/v2.038 + NOTO_VERSION="v2.038" + curl --silent -O --location --fail "https://github.com/googlefonts/noto-emoji/raw/${NOTO_VERSION}/fonts/NotoColorEmoji.ttf" + echo "NotoColorEmoji.ttf" } function download_deb() { - component=$1 + local COMPONENT=$1 + local VERSION=$([ "${ARCH}" == "amd64" ] && echo "$CHROME_VERSION" || echo "$CHROMIUM_VERSION") + local DEB=$([ "${COMPONENT}" == "browser" ] && echo "${PKG}_${VERSION}_${ARCH}.deb" || echo "${PKG}-${COMPONENT}_${VERSION}_${ARCH}.deb") - if [ "${component}" == "browser" ]; then - local DEB="${PKG}_${CHROME_VERSION}_${ARCH}.deb" - else - local DEB="${PKG}-${component}_${CHROME_VERSION}_${ARCH}.deb" - fi - - curl --silent --show-error --fail -O "${DOWNLOAD_URL_BASE}/${CHROME_VERSION}/$DEB" + curl --silent --show-error --fail -O "${DOWNLOAD_URL_BASE}/${VERSION}/${DEB}" echo "${DEB}" } function build_debian() { apt-get update - + echo "Installing browser" BROWSER_DEB="$(download_deb browser)" if [ "${ARCH}" == "arm64" ]; then @@ -79,6 +75,7 @@ function build_ubi() { BUILD_OS=${BUILD_OS:-debian} OS_VERSION=${OS_VERSION:-bullseye} CHROME_VERSION=${1:-107.0.5304.87-1} +CHROMIUM_VERSION=${2:-$CHROME_VERSION} ARCH=${TARGETARCH:-amd64} PKG=$([ "${ARCH}" == "amd64" ] && echo "google-chrome-stable" || echo "chromium") DOWNLOAD_URL_BASE="https://gitlab.com/api/v4/projects/1075790/packages/generic/${BUILD_OS}-${OS_VERSION}-${PKG}" diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 1492f9f..444eaad 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -81,16 +81,24 @@ function print_chrome_args() { case "$1" in 106|106.0) CHROME_VERSION=106.0.5249.119-1 + CHROMIUM_VERSION=$CHROME_VERSION ;; 107|107.0) CHROME_VERSION=107.0.5304.87-1 + CHROMIUM_VERSION=$CHROME_VERSION ;; 108|108.0) CHROME_VERSION=108.0.5359.94-1 + CHROMIUM_VERSION=$CHROME_VERSION + ;; + 109|109.0) + CHROME_VERSION=109.0.5414.119-1 + CHROMIUM_VERSION=109.0.5414.74-2 ;; *) fail "Unknown chrome version $1" ;; esac printf -- "--build-arg CHROME_VERSION=%s " "$CHROME_VERSION" + printf -- "--build-arg CHROMIUM_VERSION=%s " "$CHROMIUM_VERSION" } # see https://www.kernel.org/pub/software/scm/git