Skip to content

Commit 2e15a18

Browse files
Vamshi-MicrosoftVamshi-Microsoft
committed
Remove export command
1 parent 5781e12 commit 2e15a18

4 files changed

Lines changed: 22 additions & 25 deletions

File tree

‎.github/workflows/deploy.yml‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
4848
- name: Run Quota Check
4949
id: quota-check
50+
env:
51+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
52+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
53+
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
54+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
55+
GPT_MIN_CAPACITY: "100"
56+
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
5057
run: |
51-
export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
52-
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
53-
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
54-
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
55-
export GPT_MIN_CAPACITY="100"
56-
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
57-
5858
chmod +x infra/scripts/checkquota.sh
5959
if ! infra/scripts/checkquota.sh; then
6060
# If quota check fails due to insufficient quota, set the flag
@@ -171,18 +171,17 @@ jobs:
171171
echo "✅ Deployment succeeded."
172172
echo "$DEPLOY_OUTPUT"
173173
174-
# Export variables only after successful deploy
175-
export CONTAINER_API_APPURL=$(echo "$DEPLOY_OUTPUT" | jq -r '.containeR_API_APP_FQDN.value')
174+
CONTAINER_API_APPURL=$(echo "$DEPLOY_OUTPUT" | jq -r '.containeR_API_APP_FQDN.value')
176175
echo "CONTAINER_API_APPURL=$CONTAINER_API_APPURL" >> $GITHUB_ENV
177176
178-
export CONTAINER_API_APPNAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.containeR_API_APP_NAME.value')
177+
CONTAINER_API_APPNAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.containeR_API_APP_NAME.value')
179178
echo "CONTAINER_API_APPNAME=$CONTAINER_API_APPNAME" >> $GITHUB_ENV
180179
181-
export CONTAINER_WEB_APPURL="https://$(echo "$DEPLOY_OUTPUT" | jq -r '.containeR_WEB_APP_FQDN.value')"
180+
CONTAINER_WEB_APPURL="https://$(echo "$DEPLOY_OUTPUT" | jq -r '.containeR_WEB_APP_FQDN.value')"
182181
echo "CONTAINER_WEB_APPURL=$CONTAINER_WEB_APPURL" >> $GITHUB_ENV
183182
echo "CONTAINER_WEB_APPURL=$CONTAINER_WEB_APPURL" >> $GITHUB_OUTPUT
184183
185-
export CONTAINER_WEB_APPNAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.containeR_WEB_APP_NAME.value')
184+
CONTAINER_WEB_APPNAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.containeR_WEB_APP_NAME.value')
186185
echo "CONTAINER_WEB_APPNAME=$CONTAINER_WEB_APPNAME" >> $GITHUB_ENV
187186
188187
- name: Register schemas

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,17 +301,17 @@ jobs:
301301
exit 1
302302
fi
303303
304-
export CONTAINER_API_APPURL="https://$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_API_APP_FQDN // empty')"
304+
CONTAINER_API_APPURL="https://$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_API_APP_FQDN // empty')"
305305
echo "CONTAINER_API_APPURL=$CONTAINER_API_APPURL" >> $GITHUB_ENV
306306
307-
export CONTAINER_API_APPNAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_API_APP_NAME // empty')
307+
CONTAINER_API_APPNAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_API_APP_NAME // empty')
308308
echo "CONTAINER_API_APPNAME=$CONTAINER_API_APPNAME" >> $GITHUB_ENV
309309
310-
export CONTAINER_WEB_APPURL="https://$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_WEB_APP_FQDN // empty')"
310+
CONTAINER_WEB_APPURL="https://$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_WEB_APP_FQDN // empty')"
311311
echo "CONTAINER_WEB_APPURL=$CONTAINER_WEB_APPURL" >> $GITHUB_ENV
312312
echo "CONTAINER_WEB_APPURL=$CONTAINER_WEB_APPURL" >> $GITHUB_OUTPUT
313313
314-
export CONTAINER_WEB_APPNAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_WEB_APP_NAME // empty')
314+
CONTAINER_WEB_APPNAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.CONTAINER_WEB_APP_NAME // empty')
315315
echo "CONTAINER_WEB_APPNAME=$CONTAINER_WEB_APPNAME" >> $GITHUB_ENV
316316
317317
- name: Register schemas (Linux)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ jobs:
291291
exit 1
292292
}
293293
294-
# Export variables only after successful deploy
295294
$CONTAINER_API_APPURL = "https://$($DEPLOY_OUTPUT.CONTAINER_API_APP_FQDN)"
296295
"CONTAINER_API_APPURL=$CONTAINER_API_APPURL" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
297296

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -317,15 +317,14 @@ jobs:
317317
318318
- name: Run Quota Check
319319
id: quota-check
320-
shell: bash
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+
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
321327
run: |
322-
export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
323-
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
324-
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
325-
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
326-
export GPT_MIN_CAPACITY=${{ env.GPT_MIN_CAPACITY }}
327-
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
328-
329328
chmod +x infra/scripts/checkquota.sh
330329
if ! infra/scripts/checkquota.sh; then
331330
if grep -q "No region with sufficient quota found" infra/scripts/checkquota.sh; then

0 commit comments

Comments
 (0)