actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-12 15:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken run-helper update syntax and run-helper not updating on restart (#2050)

Browse Source 
* Fix broken syntax in update wait for loop

* Update run-helper after each restart, not only at first
This commit is contained in:
Ferenc Hammerl
2022-08-09 16:50:52 +02:00
committed by GitHub
parent 352f201c62
commit 694d73d43c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Misc/layoutroot/run-helper.sh.template
View File

@@ -35,7 +35,7 @@ elif [[ $returnCode == 2 ]]; then
elif [[ $returnCode == 3 ]]; then elif [[ $returnCode == 3 ]]; then
# Wait for 30 seconds or for flag file to exists for the runner update process finish # Wait for 30 seconds or for flag file to exists for the runner update process finish
echo "Runner listener exit because of updating, re-launch runner after successful update" echo "Runner listener exit because of updating, re-launch runner after successful update"
for i in {0..30} do for i in {0..30}; do
if test -f "$updateFile"; then if test -f "$updateFile"; then
echo "Update finished successfully." echo "Update finished successfully."
rm "$updateFile" rm "$updateFile"
@@ -47,7 +47,7 @@ elif [[ $returnCode == 3 ]]; then
elif [[ $returnCode == 4 ]]; then elif [[ $returnCode == 4 ]]; then
# Wait for 30 seconds or for flag file to exists for the ephemeral runner update process finish # Wait for 30 seconds or for flag file to exists for the ephemeral runner update process finish
echo "Runner listener exit because of updating, re-launch runner after successful update" echo "Runner listener exit because of updating, re-launch runner after successful update"
for i in {0..30} do for i in {0..30}; do
if test -f "$updateFile"; then if test -f "$updateFile"; then
echo "Update finished successfully." echo "Update finished successfully."
rm "$updateFile" rm "$updateFile"

2
src/Misc/layoutroot/run.sh
View File

@@ -9,10 +9,10 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
[[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh
# run the helper process which keep the listener alive # run the helper process which keep the listener alive
while :; while :;
do do
cp -f "$DIR"/run-helper.sh.template "$DIR"/run-helper.sh
"$DIR"/run-helper.sh $* "$DIR"/run-helper.sh $*
returnCode=$? returnCode=$?
if [[ $returnCode -eq 2 ]]; then if [[ $returnCode -eq 2 ]]; then