@@ -57,13 +57,20 @@ jobs:
5757 echo "Service Principal Object ID: $SP_OBJECT_ID"
5858 - name : Create Resource Group if needed
5959 run : |
60- RG_EXISTS=$(az group exists --name ${{ vars.AZURE_RESOURCE_GROUP }})
60+ # Use provided RG name or derive from environment name
61+ RESOURCE_GROUP="${AZURE_RESOURCE_GROUP:-rg-${AZURE_ENV_NAME}}"
62+ echo "Using resource group: $RESOURCE_GROUP"
63+
64+ RG_EXISTS=$(az group exists --name "$RESOURCE_GROUP")
6165 if [ "$RG_EXISTS" = "false" ]; then
62- echo "Creating resource group: ${{ vars.AZURE_RESOURCE_GROUP }} "
63- az group create --name ${{ vars.AZURE_RESOURCE_GROUP }} --location ${{ vars.AZURE_LOCATION }}
66+ echo "Creating resource group: $RESOURCE_GROUP "
67+ az group create --name "$RESOURCE_GROUP" --location ${{ vars.AZURE_LOCATION }}
6468 else
65- echo "Resource group already exists: ${{ vars.AZURE_RESOURCE_GROUP }} "
69+ echo "Resource group already exists: $RESOURCE_GROUP "
6670 fi
71+
72+ # Set for subsequent steps
73+ echo "RESOURCE_GROUP=$RESOURCE_GROUP" >> $GITHUB_ENV
6774 - name : Configure AZD Environment
6875 run : |
6976 # Create environment if it doesn't exist
7683 fi
7784
7885 # Set environment variables
86+ azd env set AZURE_RESOURCE_GROUP "$RESOURCE_GROUP"
7987 azd env set principalType ServicePrincipal
8088 azd env set principalId $principalId
8189 azd env set fabricWorkspaceMode skip
0 commit comments