Skip to content

ci: Merging dev to main #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 5, 2025
Merged

ci: Merging dev to main #176

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
74dba70
Update deploy.yml
Roopan-Microsoft May 5, 2025
dd0e962
Set default value for prefix parameter and disable local authenticati…
Abdul-Microsoft May 5, 2025
c54bb45
Disable local authentication for AI services in Bicep template
Abdul-Microsoft May 5, 2025
bab7a6f
Add secure parameters for all keyvault param
Abdul-Microsoft May 5, 2025
2189a2e
Remove secure attribute from parameters in Bicep and update main.json
Abdul-Microsoft May 5, 2025
3a0f9d2
Update prefix parameter default value in Bicep and JSON files
Abdul-Microsoft May 5, 2025
882473c
Update azure.yaml
gpickett May 5, 2025
bb9f995
Update azure.yaml
gpickett May 5, 2025
2b65a27
Update main.bicep
gpickett May 5, 2025
976ee46
Update main.bicep
gpickett May 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
export GPT_MIN_CAPACITY="50"
export AZURE_REGIONS="${{ vars.AZURE_REGIONS }}"

chmod +x deploy/scripts/checkquota.sh
if ! deploy/scripts/checkquota.sh; then
chmod +x infra/scripts/checkquota.sh
if ! infra/scripts/checkquota.sh; then
# If quota check fails due to insufficient quota, set the flag
if grep -q "No region with sufficient quota found" deploy/scripts/checkquota.sh; then
if grep -q "No region with sufficient quota found" infra/scripts/checkquota.sh; then
echo "QUOTA_FAILED=true" >> $GITHUB_ENV
fi
exit 1 # Fail the pipeline if any other failure occurs
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
set -e
az deployment group create \
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
--template-file deploy/macae.bicep \
--template-file infra/macae.bicep \
--parameters azureOpenAILocation=${{env.AZURE_LOCATION }} cosmosLocation=${{env.AZURE_LOCATION }}


Expand Down Expand Up @@ -282,4 +282,4 @@ jobs:
echo "Purged the openai resource: ${{ env.OPENAI_RESOURCE_NAME }}"
fi

echo "Resource purging completed successfully"
echo "Resource purging completed successfully"
Loading