From 65e21606054b0cc87ecb68d6b2ad2ea01fb5b129 Mon Sep 17 00:00:00 2001 From: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Date: Fri, 3 Jan 2025 23:59:04 +0530 Subject: [PATCH 1/3] Update requirements.txt --- ClientAdvisor/AzureFunction/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ClientAdvisor/AzureFunction/requirements.txt b/ClientAdvisor/AzureFunction/requirements.txt index 4d33b23bf..2b03f77d6 100644 --- a/ClientAdvisor/AzureFunction/requirements.txt +++ b/ClientAdvisor/AzureFunction/requirements.txt @@ -5,6 +5,6 @@ azure-functions azurefunctions-extensions-http-fastapi==1.0.0b1 openai==1.58.1 -semantic_kernel==1.17.1 +semantic_kernel==1.0.4 pymssql==2.3.2 azure-search-documents==11.6.0b8 From a3586f4cb823b84eeb1542ce8be3b01b2d5d674d Mon Sep 17 00:00:00 2001 From: Harmanpreet-Microsoft Date: Tue, 7 Jan 2025 15:18:52 +0530 Subject: [PATCH 2/3] Delete .github/workflows/sync-branches.yml --- .github/workflows/sync-branches.yml | 44 ----------------------------- 1 file changed, 44 deletions(-) delete mode 100644 .github/workflows/sync-branches.yml diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml deleted file mode 100644 index 7e4e8b453..000000000 --- a/.github/workflows/sync-branches.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Sync Main to dependabotchanges - -on: - # Schedule the sync job to run daily or customize as needed - schedule: - - cron: '0 1 * * *' # Runs every day at 1 AM UTC - # Trigger the sync job on pushes to the main branch - push: - branches: - - main - -jobs: - sync: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - with: - fetch-depth: 0 # Fetch all history for accurate branch comparison - - - name: Configure Git - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - - - name: Sync main to dependabotchanges - run: | - # Ensure we're on the main branch - git checkout main - # Fetch the latest changes - git pull origin main - - # Switch to dependabotchanges branch - git checkout dependabotchanges - # Merge main branch changes - git merge main --no-edit - - # Push changes back to dependabotchanges1 branch - git push origin dependabotchanges - - - name: Notify on Failure - if: failure() - run: echo "Sync from main to dependabotchanges failed!" From d5776d23c6674f2512dc65453fd88f8c7a48599b Mon Sep 17 00:00:00 2001 From: Prasanjeet-Microsoft Date: Fri, 10 Jan 2025 18:52:59 +0530 Subject: [PATCH 3/3] Downgrade msal[broker] to 1.24.0b1 and azure-mgmt-resource to 23.1.0b2 --- .../Deployment/scripts/aihub_scripts/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ResearchAssistant/Deployment/scripts/aihub_scripts/requirements.txt b/ResearchAssistant/Deployment/scripts/aihub_scripts/requirements.txt index 0b4926790..df3b71aa7 100644 --- a/ResearchAssistant/Deployment/scripts/aihub_scripts/requirements.txt +++ b/ResearchAssistant/Deployment/scripts/aihub_scripts/requirements.txt @@ -2,7 +2,7 @@ azure-identity azure-keyvault-secrets azure-ai-resources azure-ai-ml==1.23.0 -msal[broker]==1.31.1 -azure-mgmt-resource +msal[broker]==1.24.0b1 +azure-mgmt-resource==23.1.0b2 azure-mgmt-cognitiveservices azure-mgmt-search \ No newline at end of file