Skip to content

Commit e5c5f8a

Browse files
Vamshi-MicrosoftVamshi-Microsoft
committed
Remove export command and Curl Azure CLI setup steps and replace with Azure setup actions
1 parent 36c5b94 commit e5c5f8a

4 files changed

Lines changed: 34 additions & 54 deletions

File tree

‎.github/workflows/deploy.yml‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,21 @@ jobs:
3434
- name: Checkout Code
3535
uses: actions/checkout@v5
3636

37-
- name: Setup Azure CLI
38-
run: |
39-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
40-
az --version # Verify installation
41-
4237
- name: Login to Azure
4338
run: |
4439
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
4540
4641
- name: Run Quota Check
4742
id: quota-check
43+
env:
44+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
45+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
46+
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
47+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
48+
GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
49+
TEXT_EMBEDDING_MIN_CAPACITY: ${{ env.TEXT_EMBEDDING_MIN_CAPACITY }}
50+
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
4851
run: |
49-
export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
50-
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
51-
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
52-
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
53-
export GPT_MIN_CAPACITY=${{ env.GPT_MIN_CAPACITY }}
54-
export TEXT_EMBEDDING_MIN_CAPACITY=${{ env.TEXT_EMBEDDING_MIN_CAPACITY }}
55-
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
56-
5752
chmod +x scripts/checkquota.sh
5853
if ! scripts/checkquota.sh; then
5954
# If quota check fails due to insufficient quota, set the flag
@@ -227,11 +222,6 @@ jobs:
227222
env:
228223
RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
229224
steps:
230-
- name: Setup Azure CLI
231-
run: |
232-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
233-
az --version # Verify installation
234-
235225
- name: Login to Azure
236226
run: |
237227
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}

‎.github/workflows/job-cleanup-deployment.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ jobs:
5555
ENV_NAME: ${{ inputs.ENV_NAME }}
5656
IMAGE_TAG: ${{ inputs.IMAGE_TAG }}
5757
steps:
58-
- name: Setup Azure CLI
59-
shell: bash
60-
run: |
61-
if [[ "${{ runner.os }}" == "Linux" ]]; then
62-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
63-
fi
64-
az --version
65-
6658
- name: Login to Azure
6759
shell: bash
6860
run: |

‎.github/workflows/job-deploy-linux.yml‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -196,18 +196,9 @@ jobs:
196196
else
197197
echo "🔧 Configuring Non-WAF deployment - using default main.parameters.json..."
198198
fi
199-
200-
- name: Setup Azure CLI
201-
shell: bash
202-
run: |
203-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
204199
205-
- name: Setup Azure Developer CLI (Linux)
206-
if: runner.os == 'Linux'
207-
shell: bash
208-
run: |
209-
curl -fsSL https://aka.ms/install-azd.sh | sudo bash
210-
azd version
200+
- name: Install azd
201+
uses: Azure/setup-azd@v2
211202

212203
- name: Login to AZD
213204
id: login-azure
@@ -298,26 +289,25 @@ jobs:
298289
fi
299290
300291
# Extract values from azd output (adjust these based on actual output variable names)
301-
export AI_FOUNDRY_RESOURCE_ID=$(echo "$DEPLOY_OUTPUT" | jq -r '.AI_FOUNDRY_RESOURCE_ID // empty')
292+
AI_FOUNDRY_RESOURCE_ID=$(echo "$DEPLOY_OUTPUT" | jq -r '.AI_FOUNDRY_RESOURCE_ID // empty')
302293
echo "AI_FOUNDRY_RESOURCE_ID=$AI_FOUNDRY_RESOURCE_ID" >> $GITHUB_ENV
303294
304-
export AI_SEARCH_SERVICE_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.AI_SEARCH_SERVICE_NAME // empty')
295+
AI_SEARCH_SERVICE_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.AI_SEARCH_SERVICE_NAME // empty')
305296
echo "AI_SEARCH_SERVICE_NAME=$AI_SEARCH_SERVICE_NAME" >> $GITHUB_ENV
306297
307-
export AZURE_COSMOSDB_ACCOUNT=$(echo "$DEPLOY_OUTPUT" | jq -r '.AZURE_COSMOSDB_ACCOUNT // empty')
298+
AZURE_COSMOSDB_ACCOUNT=$(echo "$DEPLOY_OUTPUT" | jq -r '.AZURE_COSMOSDB_ACCOUNT // empty')
308299
echo "AZURE_COSMOSDB_ACCOUNT=$AZURE_COSMOSDB_ACCOUNT" >> $GITHUB_ENV
309300
310-
export STORAGE_ACCOUNT_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.STORAGE_ACCOUNT_NAME // empty')
301+
STORAGE_ACCOUNT_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.STORAGE_ACCOUNT_NAME // empty')
311302
echo "STORAGE_ACCOUNT_NAME=$STORAGE_ACCOUNT_NAME" >> $GITHUB_ENV
312303
313-
export STORAGE_CONTAINER_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.STORAGE_CONTAINER_NAME // empty')
304+
STORAGE_CONTAINER_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.STORAGE_CONTAINER_NAME // empty')
314305
echo "STORAGE_CONTAINER_NAME=$STORAGE_CONTAINER_NAME" >> $GITHUB_ENV
315306
316-
export KEY_VAULT_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.KEY_VAULT_NAME // empty')
307+
KEY_VAULT_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.KEY_VAULT_NAME // empty')
317308
echo "KEY_VAULT_NAME=$KEY_VAULT_NAME" >> $GITHUB_ENV
318309
319-
export RESOURCE_GROUP_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.RESOURCE_GROUP_NAME // .AZURE_RESOURCE_GROUP // empty')
320-
[[ -z "$RESOURCE_GROUP_NAME" ]] && export RESOURCE_GROUP_NAME="$RESOURCE_GROUP_NAME"
310+
RESOURCE_GROUP_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.RESOURCE_GROUP_NAME // empty')
321311
echo "RESOURCE_GROUP_NAME=$RESOURCE_GROUP_NAME" >> $GITHUB_ENV
322312
323313
WEB_APPURL=$(echo "$DEPLOY_OUTPUT" | jq -r '.WEB_APP_URL // .SERVICE_BACKEND_ENDPOINT_URL // empty')
@@ -329,6 +319,13 @@ jobs:
329319
env:
330320
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
331321
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
322+
STORAGE_ACCOUNT_NAME: ${{ env.STORAGE_ACCOUNT_NAME }}
323+
STORAGE_CONTAINER_NAME: ${{ env.STORAGE_CONTAINER_NAME }}
324+
KEY_VAULT_NAME: ${{ env.KEY_VAULT_NAME }}
325+
AZURE_COSMOSDB_ACCOUNT: ${{ env.AZURE_COSMOSDB_ACCOUNT }}
326+
RESOURCE_GROUP_NAME: ${{ env.RESOURCE_GROUP_NAME }}
327+
AI_SEARCH_SERVICE_NAME: ${{ env.AI_SEARCH_SERVICE_NAME }}
328+
AI_FOUNDRY_RESOURCE_ID: ${{ env.AI_FOUNDRY_RESOURCE_ID }}
332329
run: |
333330
set -e
334331
az account set --subscription "$AZURE_SUBSCRIPTION_ID"

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -317,21 +317,22 @@ jobs:
317317
318318
- name: Run Quota Check
319319
id: quota-check
320+
env:
321+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
322+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
323+
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
324+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
325+
GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
326+
TEXT_EMBEDDING_MIN_CAPACITY: ${{ env.TEXT_EMBEDDING_MIN_CAPACITY }}
327+
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
320328
run: |
321-
export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
322-
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
323-
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
324-
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
325-
export GPT_MIN_CAPACITY=${{ env.GPT_MIN_CAPACITY }}
326-
export TEXT_EMBEDDING_MIN_CAPACITY=${{ env.TEXT_EMBEDDING_MIN_CAPACITY }}
327-
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
328-
329329
chmod +x scripts/checkquota.sh
330330
if ! scripts/checkquota.sh; then
331+
# If quota check fails due to insufficient quota, set the flag
331332
if grep -q "No region with sufficient quota found" scripts/checkquota.sh; then
332333
echo "QUOTA_FAILED=true" >> $GITHUB_ENV
333334
fi
334-
exit 1
335+
exit 1 # Fail the pipeline if any other failure occurs
335336
fi
336337
337338
- name: Set Quota Failure Output

0 commit comments

Comments
 (0)