Skip to content

fix: merging dev changes to main branch #423

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
merged 21 commits into from
Apr 3, 2025
Merged

fix: merging dev changes to main branch #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
d5776d2
Downgrade msal[broker] to 1.24.0b1 and azure-mgmt-resource to 23.1.0b2
Prasanjeet-Microsoft Jan 10, 2025
56f4f45
Merge pull request #282 from microsoft/downgrade-msal-azure-mgmt-reso…
Prajwal-Microsoft Jan 10, 2025
02f68ca
Downgrade azure-ai-ml package to version 1.17.1 to resolve package ve…
Prasanjeet-Microsoft Jan 13, 2025
c39f609
Upgrade azure-ai-ml package to compatible version
Prasanjeet-Microsoft Jan 13, 2025
99b5270
Merge pull request #284 from microsoft/upgrade-azure-ai-ml-package
Prajwal-Microsoft Jan 13, 2025
94b4f4c
test: Research assistant backend unit test (#286)
Pradheep-Microsoft Jan 13, 2025
b785eb6
fix: Research Assistant Deployment Issue - Prompt Flow version update…
Pradheep-Microsoft Jan 20, 2025
07bac06
Implement Consistent Versioning and Tagging for Accelerator Images (#…
Pavan-Microsoft Jan 22, 2025
0d82faa
Dev image version check
Pavan-Microsoft Jan 27, 2025
ae75bd3
Merge pull request #291 from microsoft/PSL-PK-ImageVersion
Pavan-Microsoft Jan 27, 2025
fb30c09
Revert "feat: Dev Image Version Check Test"
Pavan-Microsoft Jan 27, 2025
a582ee1
Merge pull request #292 from microsoft/revert-291-PSL-PK-ImageVersion
Pavan-Microsoft Jan 27, 2025
2adf389
update history method changes (#295)
pradeepjha-microsoft Jan 30, 2025
951fa25
fix: Fixed Asset and retirement update query (#332)
AjitPadhi-Microsoft Feb 6, 2025
6b85ef2
fixed the UI issue in Chat history list section (#335)
Mohan-Microsoft Feb 14, 2025
c412c08
Merge branch 'main' into dev
Roopan-Microsoft Feb 26, 2025
24752c7
Added code changes to handle null object error in history generate me…
Abdul-Microsoft Feb 26, 2025
ba9eb2a
build: validated and updated dependency for BYOC-ResearchAssistant Ac…
VishalS-Microsoft Feb 28, 2025
b81be42
Upgraded Package For AI_Hub Script (#419)
UtkarshMishra-Microsoft Mar 26, 2025
0d1f835
Merge branch 'main' into dev
Roopan-Microsoft Apr 1, 2025
03d13f1
package and ai-script (#426)
UtkarshMishra-Microsoft Apr 1, 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
4 changes: 2 additions & 2 deletions .github/workflows/build-clientadvisor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ jobs:
password_secret: ${{ matrix.password_secret }}
app_name: ${{ matrix.app_name }}
dockerfile: ${{ matrix.dockerfile }}
push: ${{ github.event_name == 'push' && github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
secrets: inherit
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
secrets: inherit
4 changes: 3 additions & 1 deletion .github/workflows/build-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ jobs:
echo "tagname=dev" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_name }}" == "demo" ]]; then
echo "tagname=demo" >> $GITHUB_OUTPUT
elif [[ "${{ github.ref_name }}" == "dependabotchanges" ]]; then
echo "tagname=dependabotchanges" >> $GITHUB_OUTPUT
else
echo "tagname=default" >> $GITHUB_OUTPUT

Expand All @@ -72,4 +74,4 @@ jobs:
cache-from: type=registry,ref=${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}
tags: |
${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}
${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
${{ inputs.registry }}/${{ inputs.app_name}}:${{ steps.determine_tag.outputs.tagname }}_${{ steps.date.outputs.date }}_${{ github.run_number }}
4 changes: 2 additions & 2 deletions .github/workflows/build-researchassistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ jobs:
password_secret: ${{ matrix.password_secret }}
app_name: ${{ matrix.app_name }}
dockerfile: ${{ matrix.dockerfile }}
push: ${{ github.event_name == 'push' && github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' }}
secrets: inherit
push: ${{ github.ref_name == 'main' || github.ref_name == 'dev' || github.ref_name == 'demo' || github.ref_name == 'dependabotchanges' }}
secrets: inherit
Loading