Skip to content

Commit f9487cf

Browse files
fix: Update post-deploy script to run non-interactively and ensure Azure authentication
1 parent 219c75f commit f9487cf

1 file changed

Lines changed: 22 additions & 7 deletions

File tree

.github/workflows/job-deploy-windows.yml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -353,19 +353,34 @@ jobs:
353353
INPUT_RESOURCE_GROUP_NAME: ${{ inputs.RESOURCE_GROUP_NAME }}
354354
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
355355
AZURE_RESOURCE_GROUP: ${{ inputs.RESOURCE_GROUP_NAME }}
356+
AZURE_ENV_NAME: ${{ steps.get_output_windows.outputs.AZURE_ENV_NAME }}
356357
BACKEND_URL: ${{ steps.get_output_windows.outputs.BACKEND_URL }}
357358
AZURE_STORAGE_ACCOUNT_NAME: ${{ steps.get_output_windows.outputs.AZURE_STORAGE_ACCOUNT_NAME }}
358-
AZURE_STORAGE_CONTAINER_NAME: sample-dataset
359359
AZURE_AI_SEARCH_NAME: ${{ steps.get_output_windows.outputs.AZURE_AI_SEARCH_NAME }}
360-
AZURE_AI_SEARCH_INDEX_NAME: sample-dataset-index
361-
AZURE_ENV_NAME: ${{ steps.get_output_windows.outputs.AZURE_ENV_NAME }}
360+
# Needed by post_deploy.sh to resolve the principal id when the workflow
361+
# is signed in as a service principal (no interactive user).
362+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
362363
run: |
363364
set -e
365+
366+
# Use the same login pattern as selecting_team_config_and_data.sh:
367+
# confirm an Azure CLI session is active. The preceding "Refresh Azure
368+
# login" step re-establishes credentials, so we only verify here.
369+
if az account show >/dev/null 2>&1; then
370+
echo "Already authenticated with Azure."
371+
else
372+
echo "ERROR: Not authenticated with Azure. The 'Refresh Azure login' step must run before this step."
373+
exit 1
374+
fi
364375
az account set --subscription "${{ secrets.AZURE_SUBSCRIPTION_ID }}"
365-
366-
# Upload team configurations and index sample data in one step
367-
# Automatically select "6" (All use cases) for non-interactive deployment
368-
echo "6" | bash infra/scripts/selecting_team_config_and_data.sh
376+
377+
# Run the unified post-deploy script non-interactively.
378+
# --use-case 7 installs all use cases; --resource-group enables fallbacks
379+
# to deployment outputs / naming-convention if azd env values are missing.
380+
bash infra/scripts/post_deploy.sh \
381+
--resource-group "$INPUT_RESOURCE_GROUP_NAME" \
382+
--use-case 7 \
383+
--non-interactive
369384
370385
- name: Generate Deployment Summary
371386
if: always()

0 commit comments

Comments
 (0)