diff --git a/.github/workflows/DeployEverything.yml b/.github/workflows/DeployEverything.yml index d8231da..271fa1e 100644 --- a/.github/workflows/DeployEverything.yml +++ b/.github/workflows/DeployEverything.yml @@ -109,6 +109,7 @@ jobs: - run: | cp PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/appsettings.${{ inputs.env }}.json PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/appsettings.Production.json + if: ${{ inputs.env != 'Production' }} - run: | apiToken=$(az staticwebapp secrets list --name pocketddd-${{ inputs.env }}-blazorclient --query "properties.apiKey" -o tsv) diff --git a/.github/workflows/DeployMainBranch.yml b/.github/workflows/DeployMainBranch.yml index 3fb5b09..5c70caf 100644 --- a/.github/workflows/DeployMainBranch.yml +++ b/.github/workflows/DeployMainBranch.yml @@ -1,11 +1,12 @@ -name: Deploy Branch Push +name: Deploy Main to Production on: push: branches: - 'main' + - 'fixProdDeployment' jobs: - deploy_to_test: + deploy_to_production: uses: ./.github/workflows/DeployEverything.yml with: env: "Production" diff --git a/terraform/outputs.tf b/terraform/outputs.tf index 2d24ab7..5e81d3c 100644 --- a/terraform/outputs.tf +++ b/terraform/outputs.tf @@ -2,6 +2,6 @@ output "api_server_url" { value = "https://${azurerm_linux_web_app.api_server_web_app.default_hostname}/" } -# output "client_app_public_url" { -# value = -# } +output "client_app_public_url" { + value = "https://${azurerm_static_web_app_custom_domain.custom_domain.domain_name}" +} diff --git a/tfvars/Production.tfvars b/tfvars/Production.tfvars index 8af8b9d..27cedef 100644 --- a/tfvars/Production.tfvars +++ b/tfvars/Production.tfvars @@ -1,4 +1,4 @@ -env = "prod" +env = "production" sql_db_sku = "Basic" sql_max_storage = "2" api_app_service_sku = "B1"