Skip to content

Commit bef6a2a

Browse files
authored
fix main deployment (#35)
now you can use the azure template again
1 parent 63baf8e commit bef6a2a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

azure-pipelines.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,9 @@ stages:
122122
changeLogType: 'commitBased'
123123
- stage: ReleaseToAzure
124124
displayName: Release to Azure
125-
dependsOn: Build
125+
dependsOn:
126+
- Build
127+
- ReleaseToGithub
126128
condition: succeeded()
127129
jobs:
128130
- deployment: DeployAzure

deploayWebApp.bicep

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,8 @@ resource deployWebApp 'Microsoft.Resources/deploymentScripts@2020-10-01' = if (e
109109
arguments: '-staticWebAppName ${webSiteName} -resourceGroupName ${resourceGroup().name}'
110110
scriptContent: '''
111111
param(
112-
[string] $githubToken,
113112
[string] $staticWebAppName,
114-
[string] $resourceGroupName,
115-
[string] $branch
113+
[string] $resourceGroupName
116114
)
117115
# take stable releases here
118116
$result = Invoke-RestMethod https://api.github.com/repos/codez-one/CZ.Azure.FileExchange/releases/latest -Headers @{"X-GitHub-Api-Version" = "2022-11-28" }

main.bicep

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module basics 'deployBasics.bicep' = {
1212
module webappDeployment 'deploayWebApp.bicep' = {
1313
name: 'deployment'
1414
params: {
15-
webSiteName: basics.outputs.website.name
15+
webSiteName: last(split(basics.outputs.website.resourceId, '/'))
1616
location: location
1717
}
1818
}
@@ -23,8 +23,8 @@ module events 'deployEvent.bicep' = {
2323
webappDeployment
2424
]
2525
params: {
26-
baseUrl: 'https://${basics.outputs.website.properties.defaultHostname}'
26+
baseUrl: webappDeployment.outputs.staticWebAppHost
2727
location: location
28-
storageAccountName: basics.outputs.storage.name
28+
storageAccountName: last(split(basics.outputs.storage.resourceId, '/'))
2929
}
3030
}

0 commit comments

Comments
 (0)