Skip to content

571: Stop redeploying twice #634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angelayu0530 merged 3 commits into from
Jan 13, 2026
Merged

571: Stop redeploying twice #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3378234
571: Removed code from ci/cd that deployed twice
angelayu0530 Jan 8, 2026
94993a5
571 attempted changes
angelayu0530 Jan 11, 2026
4e0cf5c
571: Removing Json Output
angelayu0530 Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 11 additions & 24 deletions .github/workflows/ci-cd.yml
View file
Open in desktop
Comment thread
angelayu0530 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -292,40 +292,27 @@ jobs:

- name: Transform App Spec with secrets
run: bash .github/scripts/transform-yaml-with-env.sh .do/prod/app.yml .env.production

- name: Update App Spec on DigitalOcean
run: |
doctl apps update ${{ env.DIGITAL_OCEAN_APP_ID }} --spec .do/prod/app.yml

- name: Trigger App Platform Redeploy
run: |
RESPONSE=$(curl -s -w "HTTPSTATUS:%{http_code}" \
-X POST \
-H "Authorization: Bearer ${{ env.DIGITAL_OCEAN_PAT }}" \
-H "Content-Type: application/json" \
https://api.digitalocean.com/v2/apps/${{ env.DIGITAL_OCEAN_APP_ID }}/deployments)

HTTP_BODY=$(echo "$RESPONSE" | sed -e 's/HTTPSTATUS:.*//g')
HTTP_STATUS=$(echo "$RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
OUTPUT=$(doctl apps update ${{ env.DIGITAL_OCEAN_APP_ID }} --spec .do/prod/app.yml --update-sources --output json)

echo "$HTTP_STATUS"
DEPLOYMENT_ID=$(echo "$OUTPUT" | jq -r '.[0].pending_deployment.id // .[0].in_progress_deployment.id // .[0].active_deployment.id // empty' | head -n 1)

if [ "$HTTP_STATUS" -lt 200 ] || [ "$HTTP_STATUS" -ge 300 ]; then
exit 1
fi

DEPLOYMENT_ID=$(echo "$HTTP_BODY" | jq -r '.deployment.id')

echo "deployment_id=$DEPLOYMENT_ID" >> $GITHUB_ENV
if [ -z "$DEPLOYMENT_ID" ] || [ "$DEPLOYMENT_ID" == "null" ]; then
echo "Failed to extract deployment ID from app update response"
exit 1
fi

echo "DEPLOYMENT_ID=$DEPLOYMENT_ID" >> $GITHUB_ENV

- name: Poll Deployment Status
run: |
DEPLOYMENT_ID="$deployment_id"

if [ -z "$DEPLOYMENT_ID" ]; then
if [ -z "$DEPLOYMENT_ID" ]; then
echo "Deployment ID is empty."
exit 1
fi
fi

echo "Waiting for deployment to be promoted."

Expand Down
32 changes: 10 additions & 22 deletions .github/workflows/deploy-stg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,37 +379,24 @@ jobs:

- name: Update App Spec on DigitalOcean
run: |
doctl apps update ${{ env.DIGITAL_OCEAN_APP_ID }} --spec .do/stg/app.yml
OUTPUT=$(doctl apps update ${{ env.DIGITAL_OCEAN_APP_ID }} --spec .do/stg/app.yml --update-sources --output json)

- name: Trigger App Platform Redeploy
run: |
RESPONSE=$(curl -s -w "HTTPSTATUS:%{http_code}" \
-X POST \
-H "Authorization: Bearer ${{ env.DIGITAL_OCEAN_PAT }}" \
-H "Content-Type: application/json" \
https://api.digitalocean.com/v2/apps/${{ env.DIGITAL_OCEAN_APP_ID }}/deployments)

HTTP_BODY=$(echo "$RESPONSE" | sed -e 's/HTTPSTATUS:.*//g')
HTTP_STATUS=$(echo "$RESPONSE" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
DEPLOYMENT_ID=$(echo "$OUTPUT" | jq -r '.[0].pending_deployment.id // .[0].in_progress_deployment.id // .[0].active_deployment.id // empty' | head -n 1)

echo "$HTTP_STATUS"

if [ "$HTTP_STATUS" -lt 200 ] || [ "$HTTP_STATUS" -ge 300 ]; then
exit 1
fi

DEPLOYMENT_ID=$(echo "$HTTP_BODY" | jq -r '.deployment.id')
if [ -z "$DEPLOYMENT_ID" ] || [ "$DEPLOYMENT_ID" == "null" ]; then
echo "Failed to extract deployment ID from app update response"
exit 1
fi

echo "deployment_id=$DEPLOYMENT_ID" >> $GITHUB_ENV
echo "DEPLOYMENT_ID=$DEPLOYMENT_ID" >> $GITHUB_ENV

- name: Poll Deployment Status
run: |
DEPLOYMENT_ID="$deployment_id"

if [ -z "$DEPLOYMENT_ID" ]; then
if [ -z "$DEPLOYMENT_ID" ]; then
echo "Deployment ID is empty."
exit 1
fi
fi

echo "Waiting for deployment to be promoted."

Expand Down Expand Up @@ -491,3 +478,4 @@ jobs:
issue_number: parseInt(prId, 10),
body: `${statusMessage}\n\n[View run](${runUrl})`
});