Skip to content

Commit 538856f

Browse files
Merge pull request #522 from microsoft/build-main-json
refactor: rebuild main.json, update deploy pipeline to use main.bicep instead of main.json
2 parents 1ecfc84 + d36c17b commit 538856f

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
az deployment group create \
139139
--name ${{ env.SOLUTION_PREFIX }}-deployment \
140140
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
141-
--template-file infra/main.json \
141+
--template-file infra/main.bicep \
142142
--parameters \
143143
environmentName="${{ env.SOLUTION_PREFIX }}" \
144144
secondaryLocation="northcentralus" \

infra/main.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.36.177.2456",
8-
"templateHash": "8486800252430863693"
8+
"templateHash": "2218487437635677522"
99
}
1010
},
1111
"parameters": {
@@ -354,8 +354,7 @@
354354
},
355355
"abbrs": "[variables('$fxv#0')]",
356356
"solutionLocation": "[if(empty(parameters('AZURE_LOCATION')), resourceGroup().location, parameters('AZURE_LOCATION'))]",
357-
"uniqueId": "[toLower(uniqueString(parameters('environmentName'), subscription().id, variables('solutionLocation')))]",
358-
"solutionPrefix": "[format('dg{0}', padLeft(take(variables('uniqueId'), 12), 12, '0'))]"
357+
"solutionPrefix": "[format('dg{0}', padLeft(take(toLower(uniqueString(subscription().id, parameters('environmentName'), resourceGroup().location, resourceGroup().name)), 12), 12, '0'))]"
359358
},
360359
"resources": [
361360
{
@@ -639,7 +638,7 @@
639638
"_generator": {
640639
"name": "bicep",
641640
"version": "0.36.177.2456",
642-
"templateHash": "8502710171947922301"
641+
"templateHash": "13327438188493804054"
643642
}
644643
},
645644
"parameters": {
@@ -950,7 +949,7 @@
950949
"name": "[parameters('embeddingModel')]",
951950
"model": "[parameters('embeddingModel')]",
952951
"sku": {
953-
"name": "Standard",
952+
"name": "GlobalStandard",
954953
"capacity": "[parameters('embeddingDeploymentCapacity')]"
955954
},
956955
"version": "2",
@@ -1809,7 +1808,7 @@
18091808
"_generator": {
18101809
"name": "bicep",
18111810
"version": "0.36.177.2456",
1812-
"templateHash": "2642619356084894434"
1811+
"templateHash": "4888491198659956603"
18131812
}
18141813
},
18151814
"parameters": {

0 commit comments

Comments
 (0)