From 2658991dd73791e425f8883190f6fab986a599b8 Mon Sep 17 00:00:00 2001
From: Matt DiMeglio <mdimeglio34@gmail.com>
Date: Sat, 7 Feb 2026 23:58:19 -0500
Subject: [PATCH] Retry -s

---
 .github/workflows/api-deploy-nonprod.yml | 31 +++++-------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/api-deploy-nonprod.yml b/.github/workflows/api-deploy-nonprod.yml
index f92ce4e..5cee609 100644
--- a/.github/workflows/api-deploy-nonprod.yml
+++ b/.github/workflows/api-deploy-nonprod.yml
@@ -102,31 +102,12 @@ jobs:
       contents: read
       packages: write
     steps:
-      - name: Trigger TeamCity Build
-        id: trigger
+      - name: Deploy to Team City
         run: |
-          echo "Triggering TeamCity build..."
-          
-          # Trigger build and get the build ID
-          BUILD_ID=$(curl -s -u "$TEAMCITY_USER:$TEAMCITY_TOKEN" \
-            -X POST \
-            -H "Content-Type: application/json" \
-            -d "{\"buildType\": {\"id\": \"$TEAMCITY_BUILD_ID\"}}" \
-            "$TEAMCITY_URL/httpAuth/app/rest/buildQueue" \
-            | grep -oP 'id="\K[0-9]+')
-          
-          echo "Build queued with ID: $BUILD_ID"
-          
-          # Query only the build state
-          BUILD_STATE=$(curl -s -u "$TEAMCITY_USER:$TEAMCITY_TOKEN" \
-            "$TEAMCITY_URL/httpAuth/app/rest/buildQueue/id:$BUILD_ID?fields=build(state)" \
-            | grep -oP 'state="\K[^"]+')
-          
-          echo "Build state: $BUILD_STATE"
-          
-          # Set GitHub Actions output
-          echo "build_state=$BUILD_STATE" >> $GITHUB_OUTPUT
-      - name: Show Build State
-        run: echo "TeamCity build is ${{ steps.trigger.outputs.build_state }}"
+          curl -s -u ${{ secrets.TEAMCITY_USERNAME }}:${{ secrets.TEAMCITY_PASSWORD }} \
+               -X POST \
+               -H "Content-Type: application/json" \
+               -d '{"buildType": {"id": "${{ secrets.TEAMCITY_API_ID }}"}}' \
+               "${{ secrets.TEAMCITY_URL }}/httpAuth/app/rest/buildQueue?fields=build(state)"