Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions .github/workflows/DeployBranchPush.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
name: Deploy Branch Push
on:
workflow_dispatch:
push:
branches-ignore:
- 'main'

jobs:
deploy_to_test:
deploy_to_dev:
uses: ./.github/workflows/DeployEverything.yml
with:
env: "Test2"
env: "dev"
secrets:
AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
AZURE_STATIC_WEB_APPS_API_TOKEN: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/DeployMainBranch.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: Deploy Main to Production
on:
workflow_dispatch:
push:
branches:
- 'main'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/DeployServerWebAPI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Publish
run: dotnet publish "${{ env.WORKING_DIRECTORY }}" --configuration ${{ env.CONFIGURATION }} --no-build --output "${{ env.AZURE_WEBAPP_PACKAGE_PATH }}"
- name: Publish Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: webapp
path: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
Expand All @@ -41,7 +41,7 @@ jobs:
with:
creds: '${{ secrets.AZURE_CREDENTIALS }}'
- name: Download artifact from build job
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: webapp
path: ${{ env.AZURE_WEBAPP_PACKAGE_PATH }}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"apiUrl": "https://pocketddd-dev-api-server-web-app.azurewebsites.net/api/",
"fakeBackend": false
}

This file was deleted.

4 changes: 2 additions & 2 deletions terraform/blazor_client.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ data "cloudflare_zone" "dns_zone" {
resource "cloudflare_record" "cname_record" {
zone_id = data.cloudflare_zone.dns_zone.id
name = local.subdomain
value = azurerm_static_web_app.blazor-client.default_host_name
content = azurerm_static_web_app.blazor-client.default_host_name
type = "CNAME"
ttl = 3600
}

resource "azurerm_static_web_app_custom_domain" "custom_domain" {
static_web_app_id = azurerm_static_web_app.blazor-client.id
domain_name = "${cloudflare_record.cname_record.name}.${data.cloudflare_zone.dns_zone.name}"
domain_name = "${cloudflare_record.cname_record.hostname}"
validation_type = "cname-delegation"
}
2 changes: 1 addition & 1 deletion tfvars/Test.tfvars → tfvars/dev.tfvars
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
env = "test"
env = "dev"
sql_db_sku = "Basic"
sql_max_storage = "2"
api_app_service_sku = "F1"
Expand Down
Loading