Skip to content

Commit 8d98298

Browse files
committed
Merge branch 'main' into macae-rfa-agent-framework
2 parents 119c659 + 176046f commit 8d98298

File tree

6 files changed

+11
-4
lines changed

6 files changed

+11
-4
lines changed

.github/workflows/azure-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
3636
AZURE_ENV_OPENAI_LOCATION : ${{ secrets.AZURE_AI_DEPLOYMENT_LOCATION }}
3737
AZURE_ENV_MODEL_CAPACITY: 1
38+
AZURE_ENV_MODEL_4_1_CAPACITY: 1
3839
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3940
# Step 3: Print the result of the validation
4041
- name: print result

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Validate Deployment v3
22

33
on:
44
workflow_run:
5-
workflows: ["Build Docker and Optional Push"]
5+
workflows: ["Build Docker and Optional Push v3"]
66
types:
77
- completed
88
branches:

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ Quick deploy
6767
### How to install or deploy
6868
Follow the quick deploy steps on the deployment guide to deploy this solution to your own Azure subscription.
6969

70+
> **Note:** This solution accelerator requires **Azure Developer CLI (azd) version 1.18.0 or higher**. Please ensure you have the latest version installed before proceeding with deployment. [Download azd here](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/install-azd).
71+
7072
[Click here to launch the deployment guide](./docs/DeploymentGuide.md)
7173
<br/><br/>
7274

azure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: multi-agent-custom-automation-engine-solution-accelerator
33
metadata:
44
55
requiredVersions:
6-
azd: ">=1.15.0 !=1.17.1"
6+
azd: '>= 1.18.0'
77
hooks:
88
postdeploy:
99
windows:

docs/DeploymentGuide.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ If you're not using one of the above options for opening the project, then you'l
160160
1. Make sure the following tools are installed:
161161

162162
- [PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-7.5) <small>(v7.0+)</small> - available for Windows, macOS, and Linux.
163-
- [Azure Developer CLI (azd)](https://aka.ms/install-azd) <small>(v1.15.0+)</small> - version
163+
- [Azure Developer CLI (azd)](https://aka.ms/install-azd) <small>(v1.18.0+)</small> - version
164164
- [Python 3.9+](https://www.python.org/downloads/)
165165
- [Docker Desktop](https://www.docker.com/products/docker-desktop/)
166166
- [Git](https://git-scm.com/downloads)
@@ -249,6 +249,7 @@ Once you've opened the project in [Codespaces](#github-codespaces), [Dev Contain
249249
```shell
250250
azd up
251251
```
252+
> **Note:** This solution accelerator requires **Azure Developer CLI (azd) version 1.18.0 or higher**. Please ensure you have the latest version installed before proceeding with deployment. [Download azd here](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/install-azd).
252253
253254
3. Provide an `azd` environment name (e.g., "macaeapp").
254255
4. Select a subscription from your Azure account and choose a location that has quota for all the resources.

infra/main.parameters.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
"gptModelCapacity": {
2424
"value": "${AZURE_ENV_MODEL_CAPACITY}"
2525
},
26+
"gpt4_1ModelCapacity": {
27+
"value": "${AZURE_ENV_MODEL_4_1_CAPACITY}"
28+
},
2629
"backendContainerImageTag": {
2730
"value": "${AZURE_ENV_IMAGE_TAG=latest_v3}"
2831
},
@@ -42,4 +45,4 @@
4245
"value": "${AZURE_EXISTING_AI_PROJECT_RESOURCE_ID}"
4346
}
4447
}
45-
}
48+
}

0 commit comments

Comments
 (0)