Skip to content

Commit 6f60cf3

Browse files
refactor: folder restructure for ca (#477)
* folder restructure for ca * piepelines updated * moved data and scripts inside infra * updated path * Path updated for dependabot and docker and other ci files * main json updated and path also udpated * file name updated
1 parent 23cbe2c commit 6f60cf3

File tree

411 files changed

+102
-21369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

411 files changed

+102
-21369
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@
55
* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
66

77
# Specific directory ownership
8-
/ClientAdvisor/ @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
9-
10-
/ResearchAssistant/ @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft
8+
@Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft

.github/dependabot.yml

Lines changed: 6 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,7 @@ version: 2
22
updates:
33
# 1. React (JavaScript/TypeScript) dependencies
44
- package-ecosystem: "npm"
5-
directory: "/ClientAdvisor/App/frontend"
6-
schedule:
7-
interval: "monthly"
8-
commit-message:
9-
prefix: "build"
10-
target-branch: "dependabotchanges"
11-
open-pull-requests-limit: 100
12-
13-
- package-ecosystem: "npm"
14-
directory: "/ResearchAssistant/App/frontend"
5+
directory: "/src/App/frontend"
156
schedule:
167
interval: "monthly"
178
commit-message:
@@ -21,43 +12,7 @@ updates:
2112

2213
# 2. Python dependencies
2314
- package-ecosystem: "pip"
24-
directory: "/ClientAdvisor/App"
25-
schedule:
26-
interval: "monthly"
27-
commit-message:
28-
prefix: "build"
29-
target-branch: "dependabotchanges"
30-
open-pull-requests-limit: 100
31-
32-
- package-ecosystem: "pip"
33-
directory: "/ClientAdvisor/AzureFunction"
34-
schedule:
35-
interval: "monthly"
36-
commit-message:
37-
prefix: "build"
38-
target-branch: "dependabotchanges"
39-
open-pull-requests-limit: 100
40-
41-
- package-ecosystem: "pip"
42-
directory: "/ClientAdvisor/Deployment/scripts/fabric_scripts"
43-
schedule:
44-
interval: "monthly"
45-
commit-message:
46-
prefix: "build"
47-
target-branch: "dependabotchanges"
48-
open-pull-requests-limit: 100
49-
50-
- package-ecosystem: "pip"
51-
directory: "/ClientAdvisor/Deployment/scripts/index_scripts"
52-
schedule:
53-
interval: "monthly"
54-
commit-message:
55-
prefix: "build"
56-
target-branch: "dependabotchanges"
57-
open-pull-requests-limit: 100
58-
59-
- package-ecosystem: "pip"
60-
directory: "/ResearchAssistant/App"
15+
directory: "/src/App"
6116
schedule:
6217
interval: "monthly"
6318
commit-message:
@@ -66,7 +21,7 @@ updates:
6621
open-pull-requests-limit: 100
6722

6823
- package-ecosystem: "pip"
69-
directory: "/ResearchAssistant/Deployment/scripts/aihub_scripts"
24+
directory: "/src/AzureFunction"
7025
schedule:
7126
interval: "monthly"
7227
commit-message:
@@ -75,7 +30,7 @@ updates:
7530
open-pull-requests-limit: 100
7631

7732
- package-ecosystem: "pip"
78-
directory: "/ResearchAssistant/Deployment/scripts/fabric_scripts"
33+
directory: "/src/infra/scripts/fabric_scripts"
7934
schedule:
8035
interval: "monthly"
8136
commit-message:
@@ -84,10 +39,10 @@ updates:
8439
open-pull-requests-limit: 100
8540

8641
- package-ecosystem: "pip"
87-
directory: "/ResearchAssistant/Deployment/scripts/index_scripts"
42+
directory: "/src/infra/scripts/index_scripts"
8843
schedule:
8944
interval: "monthly"
9045
commit-message:
9146
prefix: "build"
9247
target-branch: "dependabotchanges"
93-
open-pull-requests-limit: 16
48+
open-pull-requests-limit: 100

.github/workflows/CAdeploy.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
push:
55
branches:
66
- main
7-
paths:
8-
- 'ClientAdvisor/**'
97
schedule:
108
- cron: '0 6,18 * * *' # Runs at 6:00 AM and 6:00 PM GMT
119

@@ -28,10 +26,10 @@ jobs:
2826
export TEXT_EMBEDDING_MIN_CAPACITY="45"
2927
export AZURE_REGIONS="${{ vars.AZURE_REGIONS_CA }}"
3028
31-
chmod +x ClientAdvisor/Deployment/scripts/checkquota.sh
32-
if ! ClientAdvisor/Deployment/scripts/checkquota.sh; then
29+
chmod +x scripts/checkquota.sh
30+
if ! scripts/checkquota.sh; then
3331
# If quota check fails due to insufficient quota, set the flag
34-
if grep -q "No region with sufficient quota found" ClientAdvisor/Deployment/scripts/checkquota.sh; then
32+
if grep -q "No region with sufficient quota found" scripts/checkquota.sh; then
3533
echo "QUOTA_FAILED=true" >> $GITHUB_ENV
3634
fi
3735
exit 1 # Fail the pipeline if any other failure occurs
@@ -116,7 +114,7 @@ jobs:
116114
set -e
117115
az deployment group create \
118116
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
119-
--template-file ClientAdvisor/Deployment/bicep/main.bicep \
117+
--template-file infra/bicep/main.bicep \
120118
--parameters solutionPrefix=${{ env.SOLUTION_PREFIX }} cosmosLocation=${{ env.AZURE_LOCATION }}
121119
122120
- name: List KeyVaults and Store in Array

0 commit comments

Comments
 (0)