actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-20 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Ubuntu] Improve errexit option handling (#8352)

Browse Source
This commit is contained in:
Vasilii Polikarpov
2023-10-02 15:52:49 +02:00
committed by GitHub
parent 953177d098
commit b3c54ca36b
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
images/linux/scripts/helpers/install.sh
View File

@@ -19,16 +19,24 @@ download_with_retries() {
local COMMAND="curl $URL -4 -sL -o '$DEST/$NAME' -w '%{http_code}'" local COMMAND="curl $URL -4 -sL -o '$DEST/$NAME' -w '%{http_code}'"
fi fi
# Save current errexit state and disable it to prevent unexpected exit on error
if echo $SHELLOPTS | grep '\(^\|:\)errexit\(:\|$\)' > /dev/null;
then
local ERR_EXIT_ENABLED=true
else
local ERR_EXIT_ENABLED=false
fi
set +e
echo "Downloading '$URL' to '${DEST}/${NAME}'..." echo "Downloading '$URL' to '${DEST}/${NAME}'..."
retries=20 retries=20
interval=30 interval=30
while [ $retries -gt 0 ]; do while [ $retries -gt 0 ]; do
((retries--)) ((retries--))
# Temporary disable exit on error to retry on non-zero exit code test "$ERR_EXIT_ENABLED" = true && set +e
set +e
http_code=$(eval $COMMAND) http_code=$(eval $COMMAND)
exit_code=$? exit_code=$?
set -e test "$ERR_EXIT_ENABLED" = true && set -e
if [ $http_code -eq 200 ] && [ $exit_code -eq 0 ]; then if [ $http_code -eq 200 ] && [ $exit_code -eq 0 ]; then
echo "Download completed" echo "Download completed"
return 0 return 0

1
images/linux/scripts/installers/firefox.sh
View File

@@ -26,7 +26,6 @@ echo 'pref("intl.locale.requested","en_US");' >> "/usr/lib/firefox/browser/defau
# Download and unpack latest release of geckodriver # Download and unpack latest release of geckodriver
downloadUrl=$(get_github_package_download_url "mozilla/geckodriver" "test(\"linux64.tar.gz$\")") downloadUrl=$(get_github_package_download_url "mozilla/geckodriver" "test(\"linux64.tar.gz$\")")
echo "Downloading geckodriver $downloadUrl"
download_with_retries "$downloadUrl" "/tmp" geckodriver.tar.gz download_with_retries "$downloadUrl" "/tmp" geckodriver.tar.gz
GECKODRIVER_DIR="/usr/local/share/gecko_driver" GECKODRIVER_DIR="/usr/local/share/gecko_driver"

2
images/linux/scripts/installers/pypy.sh
View File

@@ -13,7 +13,7 @@ function InstallPyPy
PACKAGE_URL=$1 PACKAGE_URL=$1
PACKAGE_TAR_NAME=$(echo $PACKAGE_URL | awk -F/ '{print $NF}') PACKAGE_TAR_NAME=$(echo $PACKAGE_URL | awk -F/ '{print $NF}')
echo "Downloading tar archive '$PACKAGE_TAR_NAME' - '$PACKAGE_URL'" echo "Downloading tar archive '$PACKAGE_TAR_NAME'"
PACKAGE_TAR_TEMP_PATH="/tmp/$PACKAGE_TAR_NAME" PACKAGE_TAR_TEMP_PATH="/tmp/$PACKAGE_TAR_NAME"
download_with_retries $PACKAGE_URL "/tmp" $PACKAGE_TAR_NAME download_with_retries $PACKAGE_URL "/tmp" $PACKAGE_TAR_NAME