Skip to content

Commit 3691bc0

Browse files
Merge pull request #93 from microsoft/main
fix: merging main to dev
2 parents 51a2728 + 0d4d486 commit 3691bc0

4 files changed

Lines changed: 9 additions & 85 deletions

File tree

.github/workflows/azure-dev.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,6 @@ name: CI/CD Azure - Real-Time Intelligence Operations
33
# Trigger the workflow on manual dispatch
44
on:
55
workflow_dispatch:
6-
push:
7-
branches:
8-
- main
9-
- dev
10-
paths:
11-
- 'infra/**'
12-
- 'src/**'
13-
- 'azure.yaml'
14-
- 'requirements.txt'
15-
- '.github/workflows/azure-dev.yml'
16-
pull_request:
17-
branches:
18-
- main
19-
paths:
20-
- 'infra/**'
21-
- 'src/**'
22-
- 'azure.yaml'
23-
- 'requirements.txt'
24-
- '.github/workflows/azure-dev.yml'
256

267
# Set up permissions for deploying with secretless Azure federated credentials
278
permissions:

.github/workflows/create-release.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

docs/DeploymentGuide.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ Install the following tools on your local machine:
125125
| **Python** | 3.9 or later | [Download from python.org](https://www.python.org/downloads/) |
126126
| **Azure CLI** | Latest | [Install Azure CLI](https://learn.microsoft.com/cli/azure/install-azure-cli) |
127127
| **Azure Developer CLI (azd)** | Latest | [Install azd](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd) |
128+
| **Bicep CLI** | 0.33.0 or later | [Install Bicep](https://learn.microsoft.com/azure/azure-resource-manager/bicep/install) |
128129
| **Git** | Latest | [Download from git-scm.com](https://git-scm.com/downloads) |
129130

130131
<details>
@@ -134,6 +135,7 @@ Install the following tools on your local machine:
134135
python --version
135136
az --version
136137
azd version
138+
az bicep version
137139
git --version
138140
```
139141

infra/vscode_web/.env

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
AZURE_EXISTING_AGENT_ID="<%= agentId %>"
2+
AZURE_ENV_NAME="<%= playgroundName %>"
3+
# AZURE_LOCATION="<%= location %>"
4+
AZURE_SUBSCRIPTION_ID="<%= subscriptionId %>"
5+
AZURE_EXISTING_AIPROJECT_ENDPOINT="<%= endpoint %>"
6+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID="<%= projectResourceId %>"
7+
AZD_ALLOW_NON_EMPTY_FOLDER=true

0 commit comments

Comments
 (0)