Skip to content
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

Jump to bottom

fix: merging dev changes to main branch #1629

Open
wants to merge 45 commits into
base: main
Choose a base branch
from
Open

fix: merging dev changes to main branch #1629

wants to merge 45 commits into from

Conversation

Roopan-Microsoft
Copy link
Contributor

@Roopan-Microsoft Roopan-Microsoft commented Jan 20, 2025 •
edited
Loading

Purpose

  • Merging dev changes into main branch
  • Image versioning

Does this introduce a breaking change?

  • Yes
  • No

How to Test

  • Get the code
git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
npm install
  • Test the code

What to Check

Verify that the following are valid

  • Complete sanity test

Other Information

Roopan-Microsoft and others added 30 commits November 25, 2024 16:02
@Roopan-Microsoft
ci: Updated workflow to handle main, dev and demo branch | Dependabot…
2dbb0b1 
… changes (#1509)
@Roopan-Microsoft
fix: SFI Fixes & scope reverted to subscription (#1513)
97ced9f
@Roopan-Microsoft
ci: workflow updated for build docker (#1514)
903c259
@Roopan-Microsoft
ci: build docker updated for dev (#1522)
4cf2972
@Roopan-Microsoft
ci: workflow branch code updated (#1525)
9158819
@AjitPadhi-Microsoft
updated comment
4545a48
@AjitPadhi-Microsoft
updated workflow
84a33b5
@AjitPadhi-Microsoft
updated workflow
f8c1c8f
@AjitPadhi-Microsoft
updated workflow
e31a661
@AjitPadhi-Microsoft
updated bicep for registry
847ce7e
@AjitPadhi-Microsoft
fixed bicep
8f8cc98
@AjitPadhi-Microsoft @Roopan-Microsoft
fix: bicep updated (#1527)
15b948c 
Co-authored-by: Roopan P M <[email protected]>
@Roopan-Microsoft
Merge branch 'main' into dev
1645e43
@Roopan-Microsoft
Merge branch 'dev' of https://github.com/Azure-Samples/chat-with-your…
8df387a 
…-data-solution-accelerator into dev
@AjitPadhi-Microsoft
fix: Container issue fix for multiple branch (#1539)
e4dd5f2
@AjitPadhi-Microsoft @Roopan-Microsoft
fix: Updated workflow (#1540)
88d06dc 
Co-authored-by: Roopan P M <[email protected]>
@Roopan-Microsoft @AjitPadhi-Microsoft
ci: Psl container fix for checkout code from head branch (#1541)
e5cf4dd 
Co-authored-by: Ajit Padhi <[email protected]>
@AjitPadhi-Microsoft @Roopan-Microsoft
fix: multiple container tag issue fix (#1552)
02d0056 
Co-authored-by: Roopan-Microsoft <[email protected]>
@AjitPadhi-Microsoft @Roopan-Microsoft
fix: Workflow issue fix on docker image (#1554)
90e1040 
Co-authored-by: Roopan-Microsoft <[email protected]>
@Pavan-Microsoft @Roopan-Microsoft
@ross-p-smith @gpickett @Fr4nc3 @Prajwal-Microsoft
fix: Downmerge dev (#1566)
8a5a1cb 
Co-authored-by: Roopan-Microsoft <[email protected]>
Co-authored-by: Ross Smith <[email protected]>
Co-authored-by: gpickett <[email protected]>
Co-authored-by: Francia Riesco <[email protected]>
Co-authored-by: Francia Riesco <[email protected]>
Co-authored-by: Prajwal D C <[email protected]>
@Harmanpreet-Microsoft
fix: CWYD Citation Links to Documents Break After Specific Timeframe (#…
131c323 
…1569)
@UtkarshMishra-Microsoft
fix: Commit changes bug (#1568)
93b84ed
@Pavan-Microsoft
fix: Post-Deployment Script for Managing Bicep Outputs in .env File a…
0875b92 
…nd Update Conversation flow based on template selection (#1567)

Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com>
@Pavan-Microsoft
fix: import error in env_helper.py (#1571)
76190b3
@Priyanka-Microsoft
fix: add conversation flow in environment variable for adminweb app (#…
c65bf01 
…1572)
@Prasanjeet-Microsoft
fix: Update Hosting Model Configuration in ARM/Bicep Template (#1570)
1f326d9
@Priyanka-Microsoft
fix: Update main.json for changes conversation flow changes in bicep (#…
fc688c2 
…1574)
@Roopan-Microsoft
Merge branch 'main' into dev
56adb59
@Roopan-Microsoft @dependabot @Pavan-Microsoft
build: Dependabotchanges merge to Dev branch (#1602)
afaabdc 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pavan-Microsoft <[email protected]>
@Pavan-Microsoft
feat: Configurable System Prompts for Flexibility and Maintenance - C…
03f52b3 
…WYD (#1603)
Pavan-Microsoft and others added 13 commits January 2, 2025 16:45
@Pavan-Microsoft
fix: Add Missing Logs (#1609)
e92eba1
@Roopan-Microsoft
commented the prompt flow in azure yaml file
b0860ee
@Roopan-Microsoft
Merge branches 'dev' and 'dev' of https://github.com/Azure-Samples/ch…
983b1f7 
…at-with-your-data-solution-accelerator into dev
@Pavan-Microsoft
Add execute permissions parse_env.sh in postprovision hook
dae4043
@Prajwal-Microsoft
fix: Build issue with docker
08ad207
@Prajwal-Microsoft
Update build-docker.yml
c49ddfd
@Prajwal-Microsoft
fix: Docker file failure issue
5994f99
@AjitPadhi-Microsoft @Pavan-Microsoft
fix: Response getting ']' brackets, it's inconsistent (#1611)
dc7b87c 
Co-authored-by: Pavan-Microsoft <[email protected]>
@Pavan-Microsoft
fix: Fix Duplication of Flattened JSON Keys in .env File During Multi…
2d1af79 
…ple Runs (#1618)
@Pavan-Microsoft
fix: Role Duplication Error in azd up Command for PostgreSQL (#1621)
c553312
@Roopan-Microsoft
Merge branch 'main' into dev
8213f0a
@Prasanjeet-Microsoft
feat: Remove AI search service for PostgreSQL configuration to optimi…
1f22786 
…ze deployment (#1624)
@Pavan-Microsoft
feat: Implement Consistent Versioning and Tagging for Accelerator Ima…
7c2391c 
…ges (#1623)
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 20, 2025 •
edited
Loading

Coverage

Coverage Report •
FileStmtsMissCoverMissing
TOTAL381985777% 
report-only-changed-files is enabled. No files were changed during this commit :)

Tests Skipped Failures Errors Time
395 0 💤 0 ❌ 0 🔥 53.401s ⏱️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Avijit-Microsoft Avijit-Microsoft Awaiting requested review from Avijit-Microsoft Avijit-Microsoft is a code owner

@Prajwal-Microsoft Prajwal-Microsoft Awaiting requested review from Prajwal-Microsoft Prajwal-Microsoft is a code owner

@Fr4nc3 Fr4nc3 Awaiting requested review from Fr4nc3 Fr4nc3 is a code owner

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@Roopan-Microsoft @AjitPadhi-Microsoft @Pavan-Microsoft @Harmanpreet-Microsoft @UtkarshMishra-Microsoft @Priyanka-Microsoft @Prasanjeet-Microsoft @Prajwal-Microsoft