Restore lost changes from #41

* Combine layers in Docker image
* Use -c with jq when formatting client_payloads
* Refactor waiting into a common function

Originally authored by @duhow (David Girón <[email protected]>)

Author: neilmayhew

Dockerfile

@@ -1,7 +1,7 @@
 FROM alpine:3.15.0
 
-RUN apk update
-RUN apk --no-cache add curl jq coreutils
+RUN apk update \
+ && apk --no-cache add curl jq coreutils
 
 COPY entrypoint.sh /entrypoint.sh
 

entrypoint.sh

@@ -69,10 +69,10 @@ validate_args() {
     exit 1
   fi
 
-  client_payload=$(echo '{}' | jq)
+  client_payload=$(echo '{}' | jq -c)
   if [ "${INPUT_CLIENT_PAYLOAD}" ]
   then
-    client_payload=$(echo "${INPUT_CLIENT_PAYLOAD}" | jq)
+    client_payload=$(echo "${INPUT_CLIENT_PAYLOAD}" | jq -c)
   fi
 
   ref="main"
@@ -100,6 +100,12 @@ api() {
   fi
 }
 
+lets_wait() {
+  local interval=${1:-$wait_interval}
+  echo >&2 "Sleeping for $interval seconds"
+  sleep "$interval"
+}
+
 # Return the ids of the most recent workflow runs, optionally filtered by user
 get_workflow_runs() {
   since=${1:?}
@@ -129,8 +135,7 @@ trigger_workflow() {
   NEW_RUNS=$OLD_RUNS
   while [ "$NEW_RUNS" = "$OLD_RUNS" ]
   do
-    echo >&2 "Sleeping for ${wait_interval} seconds"
-    sleep "$wait_interval"
+    lets_wait
     NEW_RUNS=$(get_workflow_runs "$SINCE")
   done
 
@@ -154,8 +159,7 @@ wait_for_workflow_to_finish() {
 
   while [[ "${conclusion}" == "null" && "${status}" != "completed" ]]
   do
-    echo "Sleeping for \"${wait_interval}\" seconds"
-    sleep "${wait_interval}"
+    lets_wait
 
     workflow=$(api "runs/$last_workflow_id")
     conclusion=$(echo "${workflow}" | jq -r '.conclusion')