From 613a94fc98d8461c1f55b46fa77ad953db37091d Mon Sep 17 00:00:00 2001 From: Richard Kingston Date: Sat, 6 Sep 2025 21:03:39 +0100 Subject: [PATCH 1/2] Template logic fix for tag stage --- .azuredevops/templates/cd-infrastructure-core-common.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azuredevops/templates/cd-infrastructure-core-common.yaml b/.azuredevops/templates/cd-infrastructure-core-common.yaml index ccf41a5643..62583b1ce2 100644 --- a/.azuredevops/templates/cd-infrastructure-core-common.yaml +++ b/.azuredevops/templates/cd-infrastructure-core-common.yaml @@ -84,7 +84,7 @@ stages: displayName: Database changes condition: | or( - eq(dependencies.re_tag_stage.result, 'Succeeded'), + in(dependencies.re_tag_stage.result, 'Succeeded', 'Skipped'), eq(dependencies.terraform_deploy.jobs.terraform_apply.result, 'Succeeded') ) pool: @@ -106,7 +106,7 @@ stages: displayName: Restart Function Apps condition: | or( - eq(dependencies.re_tag_stage.result, 'Succeeded'), + in(dependencies.re_tag_stage.result, 'Succeeded', 'Skipped'), eq(dependencies.terraform_deploy.jobs.terraform_apply.result, 'Succeeded') ) pool: From 62af45c6355ebffd08367935cb6a5ea8ee57e4f0 Mon Sep 17 00:00:00 2001 From: Richard Kingston Date: Mon, 8 Sep 2025 10:47:17 +0100 Subject: [PATCH 2/2] Add matrix Sandbox deployment --- .github/workflows/cicd-1-pull-request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd-1-pull-request.yaml b/.github/workflows/cicd-1-pull-request.yaml index 6fbed52840..09c4771229 100644 --- a/.github/workflows/cicd-1-pull-request.yaml +++ b/.github/workflows/cicd-1-pull-request.yaml @@ -156,7 +156,7 @@ jobs: contents: read uses: ./.github/workflows/stage-4-deploy.yaml with: - environments: "[\"development\"]" + environments: "[\"development\",\"sbrk\"]" commit_sha: ${{ github.sha }} secrets: inherit validate-title-stage: