Skip to content

Commit 900e422

Browse files
authored
fix(ci): harden deploy-azd change outputs and APIM URL fallback (#374)
1 parent 842060f commit 900e422

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

.github/workflows/deploy-azd.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ jobs:
219219
220220
if [ ${#CHANGED_AGENTS[@]} -gt 0 ]; then
221221
AGENTS_CHANGED=true
222-
MATRIX=$(printf '%s\n' "${CHANGED_AGENTS[@]}" | jq -R . | jq -cs 'map({service: .})')
222+
MATRIX=$(printf '%s\n' "${CHANGED_AGENTS[@]}" | jq -Rcs 'split("\n")[:-1] | map(select(length > 0)) | map({service: .})')
223223
fi
224224
225225
CHANGED_AGENT_SERVICES_CSV=""
@@ -239,7 +239,7 @@ jobs:
239239
echo "crud_changed=$CRUD_CHANGED" >> "$GITHUB_OUTPUT"
240240
echo "ui_changed=$UI_CHANGED" >> "$GITHUB_OUTPUT"
241241
echo "agents_changed=$AGENTS_CHANGED" >> "$GITHUB_OUTPUT"
242-
echo "changed_agents_matrix=$MATRIX" >> "$GITHUB_OUTPUT"
242+
printf 'changed_agents_matrix=%s\n' "$MATRIX" >> "$GITHUB_OUTPUT"
243243
echo "changed_agent_services_csv=$CHANGED_AGENT_SERVICES_CSV" >> "$GITHUB_OUTPUT"
244244
echo "changed_aks_services_csv=$CHANGED_AKS_SERVICES_CSV" >> "$GITHUB_OUTPUT"
245245
echo "lib_changed=$LIB_CHANGED" >> "$GITHUB_OUTPUT"
@@ -563,6 +563,9 @@ jobs:
563563
run: |
564564
eval "$(azd env get-values -e '${{ inputs.environment }}' | sed 's/^/export /')"
565565
APIM_GATEWAY_URL_VALUE="${APIM_GATEWAY_URL:-${apimGatewayUrl:-}}"
566+
if [ "$APIM_GATEWAY_URL_VALUE" = "null" ]; then
567+
APIM_GATEWAY_URL_VALUE=""
568+
fi
566569
{
567570
echo "AI_SERVICES_NAME=${AI_SERVICES_NAME}"
568571
echo "AI_SEARCH_NAME=${AI_SEARCH_NAME}"
@@ -1013,6 +1016,10 @@ jobs:
10131016
APIM_URL="${APIM_URL%/}"
10141017
EXPECTED_APIM_URL="${EXPECTED_APIM_URL%/}"
10151018
1019+
if [ "$EXPECTED_APIM_URL" = "null" ]; then
1020+
EXPECTED_APIM_URL=""
1021+
fi
1022+
10161023
if [ -z "$APIM_URL" ]; then
10171024
echo "Failed to resolve APIM gatewayUrl for resource group $RESOURCE_GROUP. Ensure APIM exists and is provisioned before deploying UI." >&2
10181025
exit 1

0 commit comments

Comments
 (0)