@@ -101,20 +101,18 @@ jobs:
101101 export TEXT_EMBEDDING_MIN_CAPACITY=80
102102 export AZURE_REGIONS='${{ vars.AZURE_REGIONS_CA }}'
103103 chmod +x infra/scripts/checkquota.sh || true
104- if ! infra/scripts/checkquota.sh; then
105- if grep -q "No region with sufficient quota found" infra/scripts/checkquota.sh; then
106- echo "QUOTA_FAILED=true" >> $GITHUB_OUTPUT
107- fi
108- exit 1
109- fi
110- echo "QUOTA_FAILED=false" >> $GITHUB_OUTPUT
104+ # Run quota check script (sets VALID_REGION or QUOTA_FAILED in $GITHUB_ENV)
105+ infra/scripts/checkquota.sh || true
111106
112107 - name : Set Deployment Region
113108 id : set_region
114109 run : |
115- VALID_REGION=${{ inputs.azure_location }}
110+ # Prefer region found by quota check; fall back to input, then default
111+ VALID_REGION="$VALID_REGION"
112+ if [ -z "$VALID_REGION" ]; then
113+ VALID_REGION='${{ inputs.azure_location }}'
114+ fi
116115 if [ -z "$VALID_REGION" ]; then
117- # Fallback when not provided; users typically set via inputs
118116 VALID_REGION='australiaeast'
119117 fi
120118 echo "AZURE_ENV_OPENAI_LOCATION=$VALID_REGION" >> $GITHUB_OUTPUT
@@ -263,4 +261,9 @@ jobs:
263261 echo "AZURE_ENV_OPENAI_LOCATION=${{ steps.set_region.outputs.AZURE_ENV_OPENAI_LOCATION }}" >> $GITHUB_OUTPUT
264262 echo "ENV_NAME=${{ steps.env_name.outputs.ENV_NAME }}" >> $GITHUB_OUTPUT
265263 echo "IMAGE_TAG=${{ steps.image_tag.outputs.IMAGE_TAG }}" >> $GITHUB_OUTPUT
266- echo "QUOTA_FAILED=${{ steps.quota_check.outputs.QUOTA_FAILED }}" >> $GITHUB_OUTPUT
264+ # QUOTA_FAILED is set by quota script via $GITHUB_ENV; expose as output
265+ if [ -n "$QUOTA_FAILED" ]; then
266+ echo "QUOTA_FAILED=$QUOTA_FAILED" >> $GITHUB_OUTPUT
267+ else
268+ echo "QUOTA_FAILED=false" >> $GITHUB_OUTPUT
269+ fi
0 commit comments