Merge pull request #6 from cloudbeds/update-v1.6.5

update to v1.6.5

Author: svmt

Dockerfile

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

action.yml

@@ -12,7 +12,7 @@ inputs:
     description: "The repository where the workflow is contained."
     required: true
   github_token:
-    description: "The Github access token with access to the repository. Its recommended you put it under secrets."
+    description: "The Github access token with access to the repository. It is recommended you put this token under secrets."
     required: true
   github_user:
     description: "The name of the github user whose access token is being used to trigger the workflow."
@@ -38,11 +38,21 @@ inputs:
   wait_workflow:
     description: 'Wait for workflow to finish. default: true'
     required: false
+  comment_downstream_url:
+    description: 'Comment API link for commenting the downstream job URL'
+    required: false
+    default: ''
+  comment_github_token:
+    description: "The Github access token with access to the repository for comment URL. It is recommended you put this token under secrets."
+    required: false
+    default: ${{ github.token }}
 outputs:
   workflow_id:
     description: The ID of the workflow that was triggered by this action
   workflow_url:
     description: The URL of the workflow that was triggered by this action
+  conclusion:
+    description: Conclusion of the job, i.e pass/failure
 runs:
   using: 'docker'
   image: 'Dockerfile'

entrypoint.sh

@@ -84,7 +84,7 @@ validate_args() {
 
 lets_wait() {
   echo "Sleeping for ${wait_interval} seconds"
-  sleep $wait_interval
+  sleep "$wait_interval"
 }
 
 api() {
@@ -101,7 +101,11 @@ api() {
     echo >&2 "api failed:"
     echo >&2 "path: $path"
     echo >&2 "response: $response"
-    exit 1
+    if [[ "$response" == *'"Server Error"'* ]]; then
+      echo "Server error - trying again"
+    else
+      exit 1
+    fi
   fi
 }
 
@@ -148,6 +152,19 @@ trigger_workflow() {
   join -v2 <(echo "$OLD_RUNS") <(echo "$NEW_RUNS")
 }
 
+comment_downstream_link() {
+  if response=$(curl --fail-with-body -sSL -X POST \
+      "${INPUT_COMMENT_DOWNSTREAM_URL}" \
+      -H "Authorization: Bearer ${INPUT_COMMENT_GITHUB_TOKEN}" \
+      -H 'Accept: application/vnd.github.v3+json' \
+      -d "{\"body\": \"Running downstream job at $1\"}")
+  then
+    echo "$response"
+  else
+    echo >&2 "failed to comment to ${INPUT_COMMENT_DOWNSTREAM_URL}:"
+  fi
+}
+
 wait_for_workflow_to_finish() {
   last_workflow_id=${1:?}
   last_workflow_url="${GITHUB_SERVER_URL}/${INPUT_OWNER}/${INPUT_REPO}/actions/runs/${last_workflow_id}"
@@ -159,6 +176,10 @@ wait_for_workflow_to_finish() {
   echo "workflow_url=${last_workflow_url}" >> $GITHUB_OUTPUT
   echo ""
 
+  if [ -n "${INPUT_COMMENT_DOWNSTREAM_URL}" ]; then
+    comment_downstream_link ${last_workflow_url}
+  fi
+
   conclusion=null
   status=
 
@@ -172,6 +193,7 @@ wait_for_workflow_to_finish() {
 
     echo "Checking conclusion [${conclusion}]"
     echo "Checking status [${status}]"
+    echo "conclusion=${conclusion}" >> $GITHUB_OUTPUT
   done
 
   if [[ "${conclusion}" == "success" && "${status}" == "completed" ]]