Update action.sh

Author: Cyclenerd

action.sh

@@ -197,22 +197,19 @@ if [[ "$MY_RUNNER_VERSION" != "latest" && "$MY_RUNNER_VERSION" != "skip" && ! "$
 	exit_with_failure "'$MY_RUNNER_VERSION' is not a valid GitHub Actions Runner version! Enter 'latest', 'skip' or the version without 'v'."
 fi
 
-# Set maximal wait time (retries * 10 sec) for GitHub Actions Runner registration (default: 30 [5 min])
-# If MY_RUNNER_WAIT is set, use its value; otherwise, use "30".
+# Set maximal wait time (retries * 10 sec) for GitHub Actions Runner registration (default: 60 [10 min])
+# If INPUT_RUNNER_WAIT is set, use its value; otherwise, use "60".
 MY_RUNNER_WAIT=${INPUT_RUNNER_WAIT:-"60"}
 # Check if MY_RUNNER_WAIT is an integer
 if [[ ! "$MY_RUNNER_WAIT" =~ ^[0-9]+$ ]]; then
 	exit_with_failure "The maximum wait time (retries) for GitHub Action Runner registration must be an integer!"
 fi
 
-# Set create retry logic inputs
-MY_CREATE_RETRIES=${INPUT_CREATE_RETRIES:-1}
-MY_CREATE_RETRY_DELAY=${INPUT_CREATE_RETRY_DELAY:-10}
+# Set maximal wait time (retries * 10 sec) for Hetzner Server creation (default: 360 [1 hour])
+# If INPUT_CREATE_WAIT is set, use its value; otherwise, use "360".
+MY_CREATE_WAIT=${INPUT_CREATE_WAIT:-360}
 if [[ ! "$MY_CREATE_RETRIES" =~ ^[0-9]+$ ]]; then
-	exit_with_failure "The create_retries value must be an integer!"
-fi
-if [[ ! "$MY_CREATE_RETRY_DELAY" =~ ^[0-9]+$ ]]; then
-	exit_with_failure "The create_retry_delay value must be an integer!"
+	exit_with_failure "The maximum wait time (retries) for Hetzner Server creation must be an integer!"
 fi
 
 # Set Hetzner Cloud Server ID
@@ -373,9 +370,11 @@ fi
 
 # Send a POST request to the Hetzner Cloud API to create a server.
 # https://docs.hetzner.cloud/#servers-create-a-server
-MY_CREATE_ATTEMPT=1
-while [[ $MY_CREATE_ATTEMPT -le $MY_CREATE_RETRIES ]]; do
-	echo "Create server (attempt $MY_CREATE_ATTEMPT of $MY_CREATE_RETRIES)..."
+MAX_RETRIES=$MY_CREATE_WAIT
+RETRY_COUNT=0
+WAIT_SEC=10
+while [[ $RETRY_COUNT -lt $MAX_RETRIES ]]; do
+	echo "Create Server..."
 	if curl \
 	-X POST \
 	--fail-with-body \
@@ -387,16 +386,20 @@ while [[ $MY_CREATE_ATTEMPT -le $MY_CREATE_RETRIES ]]; do
 		echo "Server created successfully."
 		break
 	else
-		echo "Server creation failed (attempt $MY_CREATE_ATTEMPT)."
-		if [[ $MY_CREATE_ATTEMPT -lt $MY_CREATE_RETRIES ]]; then
-			echo "Retrying in $MY_CREATE_RETRY_DELAY seconds..."
-			sleep "$MY_CREATE_RETRY_DELAY"
-		else
-			cat "servers.json"
-			exit_with_failure "Failed to create Server in Hetzner Cloud after $MY_CREATE_RETRIES attempts!"
-		fi
+		# Check if the error is related to resource unavailability
+		if grep -q -E "resource_unavailable|resource_limit_exceeded" "servers.json"; then
+  			echo "Resource limitation detected."
+                # If error is not resource-related, don't retry
+	 	else
+            		cat "servers.json"
+  			exit_with_failure "Failed to create Server in Hetzner Cloud!"
+        	fi
 	fi
-	MY_CREATE_ATTEMPT=$((MY_CREATE_ATTEMPT + 1))
+
+	RETRY_COUNT=$((RETRY_COUNT + 1)) # Increment retry counter
+
+	echo "Failed to create Server. Wait $WAIT_SEC seconds... (Attempt $RETRY_COUNT/$MAX_RETRIES)"
+	sleep "$WAIT_SEC"
 done
 
 # Get the Hetzner Server ID from the JSON response (assuming valid JSON)
@@ -416,7 +419,6 @@ echo "server_id=$MY_HETZNER_SERVER_ID" >> "$GITHUB_OUTPUT"
 
 # Wait for server
 MAX_RETRIES=$MY_SERVER_WAIT
-WAIT_SEC=10
 RETRY_COUNT=0
 echo "Wait for server..."
 while [[ $RETRY_COUNT -lt $MAX_RETRIES ]]; do