Skip to content

Commit fde3ef2

Browse files
Merge pull request #279 from microsoft/az-search-params
refactor - azd pipeline changes
2 parents e922960 + 94623f3 commit fde3ef2

File tree

3 files changed

+25
-24
lines changed

3 files changed

+25
-24
lines changed

.azdo/pipelines/azure-dev.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
# Set this to the mainline branch you are using
33
trigger:
44
- main
5-
- master
6-
7-
8-
5+
96
pool:
107
vmImage: ubuntu-latest
118

.devcontainer/devcontainer.json

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,24 @@
11
{
2-
"name": "Azure Developer CLI",
3-
"image": "mcr.microsoft.com/devcontainers/python:3.10",
2+
"name": "azd-template",
3+
"image": "mcr.microsoft.com/devcontainers/python:3.11-bullseye",
4+
"forwardPorts": [50505],
45
"features": {
5-
"ghcr.io/devcontainers/features/node:1": {
6-
"version": "16",
7-
"nodeGypDependencies": false
8-
},
9-
"ghcr.io/devcontainers/features/azure-cli:1.0.8": {},
106
"ghcr.io/azure/azure-dev/azd:latest": {}
117
},
128
"customizations": {
139
"vscode": {
1410
"extensions": [
1511
"ms-azuretools.azure-dev",
1612
"ms-azuretools.vscode-bicep",
17-
"ms-python.python"
18-
]
19-
},
20-
"codespaces": {
21-
"openFiles": [
22-
"README.md"
13+
"ms-python.python",
14+
"ms-toolsai.jupyter",
15+
"GitHub.vscode-github-actions"
2316
]
2417
}
2518
},
26-
"forwardPorts": [
27-
5000
28-
],
19+
// "postStartCommand": "git pull origin main && python3 -m pip install -r infra/scripts/index_scripts/requirements.txt",
2920
"remoteUser": "vscode",
3021
"hostRequirements": {
31-
"memory": "8gb"
22+
"memory": "4gb"
3223
}
33-
}
24+
}

.github/workflows/azure-dev.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,20 @@ jobs:
2020
- name: Checkout code
2121
uses: actions/checkout@v4
2222

23-
# Step 2: Validate the Azure template using microsoft/template-validation-action
23+
# Step 2: Set up Azure CLI
24+
- name: Setup Azure CLI
25+
uses: azure/cli-action@v1
26+
27+
# Step 3: Login to Azure using Service Principal
28+
- name: Login with Azure using Service Principal
29+
uses: azure/login@v1
30+
with:
31+
client-id: ${{ secrets.AZURE_CLIENT_ID }}
32+
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
33+
client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
34+
35+
36+
# Step 4: Validate the Azure template using microsoft/template-validation-action
2437
- name: Validate Azure Template
2538
uses: microsoft/[email protected]
2639
id: validation
@@ -32,6 +45,6 @@ jobs:
3245
AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
3346
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3447

35-
# Step 3: Print the result of the validation
48+
# Step 5: Print the result of the validation
3649
- name: Print result
3750
run: cat ${{ steps.validation.outputs.resultFile }}

0 commit comments

Comments
 (0)