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

Merge branch 'acunskis-cache-chromium-common' into 'master'

Browse source 
Cache chromium-common package

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

Merged-by: Andrejs Cunskis <acunskis@gitlab.com>
Approved-by: Kamil Trzciński <ayufan@ayufan.eu>
This commit is contained in:
Andrejs Cunskis 2022-10-05 17:19:56 +00:00
commit af7312a4aa
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/cache-google-chrome
View file

@ -64,16 +64,19 @@ function cache-chrome() {
function cache-chromium() { function cache-chromium() {
PKG=chromium PKG=chromium
PKG_DRIVER=chromium-driver PKG_DRIVER=chromium-driver
PKG_COMMON=chromium-common
echo "Checking for latest '${PKG}' version in apt repository..." echo "Checking for latest '${PKG}' version in apt repository..."
LATEST_VERSION=$(apt-cache show $PKG | grep Version | sort | tail -1 | sed -e "s/Version: //") LATEST_VERSION=$(apt-cache show $PKG | grep Version | sort | tail -1 | sed -e "s/Version: //")
VERSION_NUMBER=$(echo $LATEST_VERSION | sed -e "s/~deb.*//") # remove debian version part to have chrome and chromium compatible version numbers VERSION_NUMBER=$(echo $LATEST_VERSION | sed -e "s/~deb.*//") # remove debian version part to have chrome and chromium compatible version numbers
CHROMIUM_DEB="${PKG}_${VERSION_NUMBER}_${TARGETARCH}.deb" CHROMIUM_DEB="${PKG}_${VERSION_NUMBER}_${TARGETARCH}.deb"
CHROMIUM_DRIVER_DEB="${PKG_DRIVER}_${VERSION_NUMBER}_${TARGETARCH}.deb" CHROMIUM_DRIVER_DEB="${PKG_DRIVER}_${VERSION_NUMBER}_${TARGETARCH}.deb"
CHROMIUM_COMMON_DEB="${PKG_COMMON}_${VERSION_NUMBER}_${TARGETARCH}.deb"
# Save both chromium and chromium-driver under the same package # Save chromium, chromium-common and chromium-driver under the same package
save-package "$PKG" "$CHROMIUM_DEB" "$VERSION_NUMBER" "${PKG}" "${PKG}_${LATEST_VERSION}_${TARGETARCH}.deb" save-package "$PKG" "$CHROMIUM_DEB" "$VERSION_NUMBER" "${PKG}" "${PKG}_${LATEST_VERSION}_${TARGETARCH}.deb"
save-package "$PKG_DRIVER" "$CHROMIUM_DRIVER_DEB" "$VERSION_NUMBER" "${PKG}" "${PKG_DRIVER}_${LATEST_VERSION}_${TARGETARCH}.deb" save-package "$PKG_DRIVER" "$CHROMIUM_DRIVER_DEB" "$VERSION_NUMBER" "${PKG}" "${PKG_DRIVER}_${LATEST_VERSION}_${TARGETARCH}.deb"
save-package "$PKG_COMMON" "$CHROMIUM_COMMON_DEB" "$VERSION_NUMBER" "${PKG}" "${PKG_COMMON}_${LATEST_VERSION}_${TARGETARCH}.deb"
} }
function notify-chrome-updated() { function notify-chrome-updated() {