contd.

Author: jasonsiders

.github/workflows/ci.yml

@@ -102,10 +102,13 @@ jobs:
         run: |
           # Re-use scratch orgs to prevent exceeding new scratch orgs/day limits:
           set -euo pipefail
-          QUERY="SELECT LoginUrl FROM ScratchOrgInfo WHERE SignupUsername LIKE '*$SCRATCH_ORG_DOMAIN'"
+          QUERY="SELECT LoginUrl, SignupUsername FROM ScratchOrgInfo WHERE SignupUsername LIKE '*$SCRATCH_ORG_DOMAIN' AND Status = 'Active'"
+          echo "$QUERY"
           RESPONSE=$(sf data query --target-org "$DEV_HUB" -q "$QUERY" --json 2>/dev/null || true)
+          echo "$RESPONSE"
           LOGIN_URL=$(echo "$RESPONSE" | jq -r '.result.records[0]?.LoginUrl // empty')
-          echo "Existing Scratch Org: $LOGIN_URL"
+          USERNAME=$(echo "$RESPONSE" | jq -r '.result.records[0]?.SignupUsername // empty')
+          echo "Existing Scratch Org: $USERNAME"
           if [[ -n "$LOGIN_URL" && "$LOGIN_URL" != "null" ]]; then
             sf org login jwt \
               --client-id "$CLIENT_ID" \