feat: Update kill logic (#6)

Co-Authored-By: Ruben Laban <[email protected]>

entrypoint.sh

@@ -29,7 +29,7 @@ else
 fi
 
 # jq queries
-jq_run_id=".workflow_runs | .[] | select(.head_branch==\"${BRANCH}\" and .status==\"in_progress\") | .id"
+jq_run_ids=".workflow_runs | .[] | select(.head_branch==\"${BRANCH}\" and (.status==\"in_progress\" or .status==\"queued\")) | .id"
 
 # get the github workflow ID
 
@@ -42,15 +42,13 @@ workflow_id=${workflow_url##/*/}
 echo "workflow id: "$workflow_id
 
 # get the run ids
-run_ids=$(curl -s ${GITHUB_API}/repos/${GITHUB_REPOSITORY}/actions/workflows/${workflow_id}/runs -H "${auth_header}" | jq -r "${jq_run_id}")
+run_ids=$(curl -s ${GITHUB_API}/repos/${GITHUB_REPOSITORY}/actions/workflows/${workflow_id}/runs -H "${auth_header}" | jq -r "${jq_run_ids}" | sort -n | head -n-1)
 
 echo "run ids: "$run_ids
 
 # cancel the previous runs
 for run_id in $run_ids
 do
-  if [ "$run_id" != "$GITHUB_RUN_ID" ]; then
-    curl -s -X POST -H "${auth_header}" ${GITHUB_API}/repos/${GITHUB_REPOSITORY}/actions/runs/${run_id}/cancel
-    echo "Cancelled run $run_id"
-  fi
+  curl -s -X POST -H "${auth_header}" ${GITHUB_API}/repos/${GITHUB_REPOSITORY}/actions/runs/${run_id}/cancel
+  echo "Cancelled run $run_id"
 done