From e23ff3204fedfc12bca9c1e09b500d0f90d88c8e Mon Sep 17 00:00:00 2001 From: Harsh-Microsoft Date: Fri, 3 Oct 2025 17:49:29 +0530 Subject: [PATCH 1/2] ci: Update environment variable assignments for SQL client IDs and names in deploy wf --- .github/workflows/CAdeploy.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CAdeploy.yml b/.github/workflows/CAdeploy.yml index 94869636..8af05246 100644 --- a/.github/workflows/CAdeploy.yml +++ b/.github/workflows/CAdeploy.yml @@ -6,6 +6,7 @@ on: - main - dev - demo + - fix-deploy-wf schedule: - cron: "0 6,18 * * *" # Runs at 6:00 AM and 6:00 PM GMT @@ -172,9 +173,9 @@ jobs: echo "SQL_SERVER_NAME=$SQL_SERVER_NAME" >> $GITHUB_ENV export SQL_DATABASE=$(echo "$DEPLOY_OUTPUT" | jq -r '.sqldB_DATABASE.value') echo "SQL_DATABASE=$SQL_DATABASE" >> $GITHUB_ENV - export CLIENT_ID=$(echo "$DEPLOY_OUTPUT" | jq -r '.managedidentitY_WEBAPP_CLIENTID.value') + export CLIENT_ID=$(echo "$DEPLOY_OUTPUT" | jq -r '.managedidentitY_SQL_CLIENTID.value') echo "CLIENT_ID=$CLIENT_ID" >> $GITHUB_ENV - export CLIENT_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.managedidentitY_WEBAPP_NAME.value') + export CLIENT_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.managedidentitY_SQL_NAME.value') echo "CLIENT_NAME=$CLIENT_NAME" >> $GITHUB_ENV export RG_NAME=$(echo "$DEPLOY_OUTPUT" | jq -r '.resourcE_GROUP_NAME.value') echo "RG_NAME=$RG_NAME" >> $GITHUB_ENV From 856eb1fe5297c9afcf8afcc8f9dfe168db1041ef Mon Sep 17 00:00:00 2001 From: Harsh-Microsoft Date: Fri, 3 Oct 2025 18:24:10 +0530 Subject: [PATCH 2/2] Remove redundant branch from deployment triggers --- .github/workflows/CAdeploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/CAdeploy.yml b/.github/workflows/CAdeploy.yml index 8af05246..0b27423e 100644 --- a/.github/workflows/CAdeploy.yml +++ b/.github/workflows/CAdeploy.yml @@ -6,7 +6,6 @@ on: - main - dev - demo - - fix-deploy-wf schedule: - cron: "0 6,18 * * *" # Runs at 6:00 AM and 6:00 PM GMT