Skip to content

fix: Merge latest changes into main branch #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Roopan-Microsoft merged 15 commits into from
Sep 22, 2025
+31 −46
Merged

fix: Merge latest changes into main branch #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d940bb1
Add createdDate parameter for deployment timestamp
Harmanpreet-Microsoft Sep 12, 2025
d4595bc
Change createdDate to use utcNow function
Harmanpreet-Microsoft Sep 12, 2025
bdf04d3
Remove 'CreatedBy' tag from resource group
Harmanpreet-Microsoft Sep 16, 2025
050d2e6
Assign Contributor role to Service Principal
Harmanpreet-Microsoft Sep 16, 2025
9a9af0d
Remove Contributor role assignment for Service Principal
Harmanpreet-Microsoft Sep 16, 2025
065214b
fixed
Kanchan-Microsoft Sep 16, 2025
2e40d83
Add CreatedBy tag to resource group
Harmanpreet-Microsoft Sep 16, 2025
f5dd9b9
Merge pull request #1 from microsoft/dev
Harmanpreet-Microsoft Sep 16, 2025
3eb9268
Assign Contributor role to Service Principal
Harmanpreet-Microsoft Sep 16, 2025
90bfbaa
Remove createdDate parameter from main.bicep
Harmanpreet-Microsoft Sep 16, 2025
9838abe
Update deploy.yml
Harmanpreet-Microsoft Sep 16, 2025
8502c35
Merge pull request #2 from microsoft/dev
Harmanpreet-Microsoft Sep 16, 2025
8420eae
Remove trailing newline in Bicep file
Harmanpreet-Microsoft Sep 16, 2025
6cff4f2
Merge pull request #212 from Harmanpreet-Microsoft/dev
Roopan-Microsoft Sep 16, 2025
835f606
Merge pull request #211 from Kanchan-Microsoft/main
Roopan-Microsoft Sep 17, 2025
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
11 changes: 10 additions & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,15 @@ jobs:
capacity=${{ env.GPT_MIN_CAPACITY }} \
imageVersion="${IMAGE_TAG}" \
createdBy="Pipeline"
- name: Assign Contributor role to Service Principal
if: always()
run: |
echo "Assigning Contributor role to SPN for RG: ${{ env.RESOURCE_GROUP_NAME }}"
az role assignment create \
--assignee ${{ secrets.AZURE_CLIENT_ID }} \
--role "Contributor" \
--scope /subscriptions/${{ secrets.AZURE_SUBSCRIPTION_ID }}/resourceGroups/${{ env.RESOURCE_GROUP_NAME }}


- name: Get Deployment Output and extract Values
id: get_output
Expand Down Expand Up @@ -403,4 +412,4 @@ jobs:
if: always()
run: |
az logout
echo "Logged out from Azure."
echo "Logged out from Azure."
62 changes: 19 additions & 43 deletions src/frontend/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@tailwindcss/vite": "^4.0.0",
"@types/react-router-dom": "^5.3.3",
"autoprefixer": "^10.4.20",
"axios": "^1.7.9",
"axios": "^1.12.2",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"lucide-react": "^0.471.1",
Expand All @@ -29,7 +29,7 @@
"react-dropzone": "^14.3.5",
"react-icons": "^5.5.0",
"react-redux": "^9.1.2",
"react-router-dom": "^7.1.3",
"react-router-dom": "^7.5.2",
"react-syntax-highlighter": "^15.6.1",
"sql-formatter": "^15.4.11",
"tailwind-merge": "^2.6.0",
Expand Down