Skip to content

Commit 112bd98

Browse files
Remove export, Curl and Map to env and setup actions
1 parent 47637a4 commit 112bd98

6 files changed

Lines changed: 18 additions & 45 deletions

File tree

.github/workflows/azure-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v4
1717

18-
- uses: microsoft/template-validation-action@Latest
18+
- uses: microsoft/template-validation-action@v0.4.3
1919
with:
2020
validateAzd: ${{ vars.AZD_VALIDATE }}
2121
useDevContainer: ${{ vars.AZD_USE_DEV_CONTAINER }}

.github/workflows/ci.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,20 @@ jobs:
4040
steps:
4141
- name: Checkout Code
4242
uses: actions/checkout@v4
43-
- name: Setup Azure CLI
44-
run: |
45-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
46-
az --version
43+
4744
- name: Login to Azure
4845
run: |
4946
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}
5047
- name: Run Quota Check
5148
id: quota-check
49+
env:
50+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
51+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
52+
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
53+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
54+
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
55+
GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
5256
run: |
53-
export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
54-
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
55-
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
56-
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
57-
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
5857
chmod +x scripts/checkquota.sh
5958
if ! scripts/checkquota.sh; then
6059
# If quota check fails due to insufficient quota, set the flag
@@ -173,10 +172,6 @@ jobs:
173172
env:
174173
RESOURCE_GROUP_NAME: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
175174
steps:
176-
- name: Setup Azure CLI
177-
run: |
178-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
179-
az --version
180175
- name: Login to Azure
181176
run: |
182177
az login --service-principal -u ${{ secrets.AZURE_CLIENT_ID }} -p ${{ secrets.AZURE_CLIENT_SECRET }} --tenant ${{ secrets.AZURE_TENANT_ID }}

.github/workflows/docker-build-and-push.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ jobs:
4141
id: date
4242
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
4343

44-
- name: Setup Azure CLI
45-
run: |
46-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
47-
az --version # Verify installation
48-
49-
5044
- name: Log in to Azure Container Registry
5145
if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo')) || (github.event_name == 'workflow_dispatch' && (github.ref_name == 'dependabotchanges'||github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo')) }}
5246
uses: azure/docker-login@v2

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,6 @@ jobs:
186186
- name: Checkout Code
187187
uses: actions/checkout@v4
188188

189-
- name: Setup Azure CLI
190-
shell: bash
191-
run: |
192-
if [[ "${{ runner.os }}" == "Linux" ]]; then
193-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
194-
fi
195-
az --version
196-
197189
- name: Setup Azure Developer CLI
198190
uses: Azure/setup-azd@v2
199191

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -198,18 +198,9 @@ jobs:
198198
else
199199
echo "🔧 Configuring Non-WAF deployment - using default main.parameters.json..."
200200
fi
201-
202-
- name: Setup Azure CLI
203-
shell: bash
204-
run: |
205-
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
206201
207-
- name: Setup Azure Developer CLI (Linux)
208-
if: runner.os == 'Linux'
209-
shell: bash
210-
run: |
211-
curl -fsSL https://aka.ms/install-azd.sh | sudo bash
212-
azd version
202+
- name: Install azd
203+
uses: Azure/setup-azd@v2
213204

214205
- name: Login to AZD
215206
id: login-azure

.github/workflows/job-deploy.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,14 @@ jobs:
300300
301301
- name: Run Quota Check
302302
id: quota-check
303+
env:
304+
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
305+
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
306+
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
307+
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
308+
AZURE_REGIONS: ${{ vars.AZURE_REGIONS }}
309+
GPT_MIN_CAPACITY: ${{ env.GPT_MIN_CAPACITY }}
303310
run: |
304-
export AZURE_CLIENT_ID=${{ secrets.AZURE_CLIENT_ID }}
305-
export AZURE_TENANT_ID=${{ secrets.AZURE_TENANT_ID }}
306-
export AZURE_CLIENT_SECRET=${{ secrets.AZURE_CLIENT_SECRET }}
307-
export AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
308-
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"
309-
export GPT_MIN_CAPACITY="${{ env.GPT_MIN_CAPACITY }}"
310311
chmod +x scripts/checkquota.sh
311312
if ! scripts/checkquota.sh; then
312313
# If quota check fails due to insufficient quota, set the flag

0 commit comments

Comments
 (0)