mirror of
https://github.com/actions/runner-images-sangeeth.git
synced 2026-01-03 15:57:26 +08:00
[Ubuntu] Rewrite function download_with_retry (#8912)
* [Ubuntu] Rewrite function download_with_retry * Fix loop exit condition
This commit is contained in:
committed by
GitHub
parent
7dba8776df
commit
abb81511d4
@@ -34,9 +34,8 @@ function GetChromiumRevision {
|
||||
|
||||
# Download and install Google Chrome
|
||||
CHROME_DEB_URL="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
|
||||
CHROME_DEB_NAME="google-chrome-stable_current_amd64.deb"
|
||||
download_with_retries $CHROME_DEB_URL "/tmp" "${CHROME_DEB_NAME}"
|
||||
apt install "/tmp/${CHROME_DEB_NAME}" -f
|
||||
CHROME_DEB_PATH=$(download_with_retry "$CHROME_DEB_URL")
|
||||
apt install "$CHROME_DEB_PATH" -f
|
||||
setEtcEnvironmentVariable "CHROME_BIN" "/usr/bin/google-chrome"
|
||||
|
||||
# Remove Google Chrome repo
|
||||
@@ -55,13 +54,12 @@ CHROME_VERSIONS_JSON=$(curl -fsSL "${CHROME_VERSIONS_URL}")
|
||||
# Download and unpack the latest release of chromedriver
|
||||
CHROMEDRIVER_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version')
|
||||
CHROMEDRIVER_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chromedriver[] | select(.platform=="'"${CHROME_PLATFORM}"'").url')
|
||||
CHROMEDRIVER_ARCHIVE="chromedriver_linux64.zip"
|
||||
CHROMEDRIVER_DIR="/usr/local/share/chromedriver-linux64"
|
||||
CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver"
|
||||
|
||||
echo "Installing chromedriver version $CHROMEDRIVER_VERSION"
|
||||
download_with_retries $CHROMEDRIVER_URL "/tmp" $CHROMEDRIVER_ARCHIVE
|
||||
unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d /usr/local/share
|
||||
driver_archive_path=$(download_with_retry "$CHROMEDRIVER_URL")
|
||||
unzip -qq "$driver_archive_path" -d /usr/local/share
|
||||
|
||||
chmod +x $CHROMEDRIVER_BIN
|
||||
ln -s "$CHROMEDRIVER_BIN" /usr/bin/
|
||||
@@ -71,14 +69,13 @@ setEtcEnvironmentVariable "CHROMEWEBDRIVER" "${CHROMEDRIVER_DIR}"
|
||||
CHROME_REVISION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].revision')
|
||||
CHROMIUM_REVISION=$(GetChromiumRevision $CHROME_REVISION)
|
||||
CHROMIUM_URL="https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${CHROMIUM_REVISION}%2Fchrome-linux.zip?alt=media"
|
||||
CHROMIUM_ARCHIVE="${CHROMIUM_REVISION}-chromium-linux.zip"
|
||||
CHROMIUM_DIR="/usr/local/share/chromium"
|
||||
CHROMIUM_BIN="${CHROMIUM_DIR}/chrome-linux/chrome"
|
||||
|
||||
echo "Installing chromium revision $CHROMIUM_REVISION"
|
||||
download_with_retries $CHROMIUM_URL "/tmp" $CHROMIUM_ARCHIVE
|
||||
CHROMIUM_ARCHIVE_PATH=$(download_with_retry "$CHROMIUM_URL")
|
||||
mkdir $CHROMIUM_DIR
|
||||
unzip -qq /tmp/$CHROMIUM_ARCHIVE -d $CHROMIUM_DIR
|
||||
unzip -qq "$CHROMIUM_ARCHIVE_PATH" -d $CHROMIUM_DIR
|
||||
|
||||
ln -s $CHROMIUM_BIN /usr/bin/chromium
|
||||
ln -s $CHROMIUM_BIN /usr/bin/chromium-browser
|
||||
|
||||
Reference in New Issue
Block a user