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

Add chrome 109 to build matrix

Browse source
This commit is contained in:
Andrejs Cunskis 2023-02-07 14:38:10 +00:00
parent 2cc3d8c64b
commit 3c5a28c0de
4 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scripts/install-chrome
View file

@ -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}"