Skip to content

Commit cebf2a9

Browse files
Merge branch 'dev' into dependabotchanges
2 parents f3e7ef3 + 0aba1bc commit cebf2a9

File tree

4 files changed

+84
-10
lines changed

4 files changed

+84
-10
lines changed

.github/workflows/stale-bot.yml

Lines changed: 69 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,82 @@
1-
name: 'Stale Bot'
1+
name: "Manage Stale Issues, PRs & Unmerged Branches"
22
on:
33
schedule:
4-
- cron: '30 1 * * *'
5-
4+
- cron: '30 1 * * *' # Runs daily at 1:30 AM UTC
5+
workflow_dispatch: # Allows manual triggering
66
permissions:
77
contents: write
88
issues: write
99
pull-requests: write
10-
1110
jobs:
1211
stale:
1312
runs-on: ubuntu-latest
1413
steps:
15-
- uses: actions/stale@v9
14+
- name: Mark Stale Issues and PRs
15+
uses: actions/stale@v9
1616
with:
17-
stale-issue-message: 'This issue is stale because it has been open 180 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
17+
stale-issue-message: "This issue is stale because it has been open 180 days with no activity. Remove stale label or comment, or it will be closed in 30 days."
18+
stale-pr-message: "This PR is stale because it has been open 180 days with no activity. Please update or it will be closed in 30 days."
1819
days-before-stale: 180
1920
days-before-close: 30
21+
exempt-issue-labels: "keep"
22+
exempt-pr-labels: "keep"
23+
cleanup-branches:
24+
runs-on: ubuntu-latest
25+
steps:
26+
- name: Checkout Repository
27+
uses: actions/checkout@v4
28+
with:
29+
fetch-depth: 0 # Fetch full history for accurate branch checks
30+
- name: Fetch All Branches
31+
run: git fetch --all --prune
32+
- name: List Merged Branches With No Activity in Last 3 Months
33+
run: |
34+
35+
echo "Branch Name,Last Commit Date,Committer,Committed In Branch,Action" > merged_branches_report.csv
36+
37+
for branch in $(git for-each-ref --format '%(refname:short) %(committerdate:unix)' refs/remotes/origin | awk -v date=$(date -d '3 months ago' +%s) '$2 < date {print $1}'); do
38+
if [[ "$branch" != "origin/main" && "$branch" != "origin/dev" ]]; then
39+
branch_name=${branch#origin/}
40+
# Ensure the branch exists locally before getting last commit date
41+
git fetch origin "$branch_name" || echo "Could not fetch branch: $branch_name"
42+
last_commit_date=$(git log -1 --format=%ci "origin/$branch_name" || echo "Unknown")
43+
committer_name=$(git log -1 --format=%cn "origin/$branch_name" || echo "Unknown")
44+
committed_in_branch=$(git branch -r --contains "origin/$branch_name" | tr -d ' ' | paste -sd "," -)
45+
echo "$branch_name,$last_commit_date,$committer_name,$committed_in_branch,Delete" >> merged_branches_report.csv
46+
fi
47+
done
48+
- name: List PR Approved and Merged Branches Older Than 30 Days
49+
run: |
50+
51+
for branch in $(gh api repos/${{ github.repository }}/pulls --jq '.[] | select(.merged_at != null and (.base.ref == "main" or .base.ref == "dev")) | select(.merged_at | fromdateiso8601 < (now - 2592000)) | .head.ref'); do
52+
# Ensure the branch exists locally before getting last commit date
53+
git fetch origin "$branch" || echo "Could not fetch branch: $branch"
54+
last_commit_date=$(git log -1 --format=%ci origin/$branch || echo "Unknown")
55+
committer_name=$(git log -1 --format=%cn origin/$branch || echo "Unknown")
56+
committed_in_branch=$(git branch -r --contains "origin/$branch" | tr -d ' ' | paste -sd "," -)
57+
echo "$branch,$last_commit_date,$committer_name,$committed_in_branch,Delete" >> merged_branches_report.csv
58+
done
59+
env:
60+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
- name: List Open PR Branches With No Activity in Last 3 Months
62+
run: |
63+
64+
for branch in $(gh api repos/${{ github.repository }}/pulls --state open --jq '.[] | select(.base.ref == "main" or .base.ref == "dev") | .head.ref'); do
65+
# Ensure the branch exists locally before getting last commit date
66+
git fetch origin "$branch" || echo "Could not fetch branch: $branch"
67+
last_commit_date=$(git log -1 --format=%ci origin/$branch || echo "Unknown")
68+
committer_name=$(git log -1 --format=%cn origin/$branch || echo "Unknown")
69+
if [[ $(date -d "$last_commit_date" +%s) -lt $(date -d '3 months ago' +%s) ]]; then
70+
# If no commit in the last 3 months, mark for deletion
71+
committed_in_branch=$(git branch -r --contains "origin/$branch" | tr -d ' ' | paste -sd "," -)
72+
echo "$branch,$last_commit_date,$committer_name,$committed_in_branch,Delete" >> merged_branches_report.csv
73+
fi
74+
done
75+
env:
76+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77+
- name: Upload CSV Report of Inactive Branches
78+
uses: actions/upload-artifact@v4
79+
with:
80+
name: merged-branches-report
81+
path: merged_branches_report.csv
82+
retention-days: 30

App/kernel-memory/Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<!-- Semantic Kernel -->
6767
<ItemGroup>
6868
<PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.1" />
69-
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.31.0" />
69+
<PackageVersion Include="Microsoft.SemanticKernel.Abstractions" Version="1.15.1" />
7070
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.15.1" />
7171
</ItemGroup>
7272
<!-- Documentation -->
134 KB
Loading

README.DEPLOYMENT.md

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@
3737

3838
1. **Azure Access** - subscription-level `Owner` or `User Access Administrator` role required.
3939

40+
1. **Microsoft.Compute Registration** - Ensure that **Microsoft.Compute** is registered in your Azure subscription by following these steps:
41+
1. Log in to your **Azure Portal**.
42+
2. Navigate to your **active Azure subscription**.
43+
3. Go to **Settings** and select **Resource Providers**.
44+
4. Check for Microsoft.Compute and click Register if it is not already registered.
45+
<br>
46+
<img src="./Images/readme_deployment/Subscription_ResourceProvider.png" alt="ResourceProvider" width="900">
47+
4048

4149
## Regional Availability
4250

@@ -74,13 +82,13 @@ Open PowerShell, change directory where you code cloned, then run the deploy scr
7482
cd .\Deployment\
7583
```
7684
```
77-
.\resourdedeployment.ps1
85+
.\resourcedeployment.ps1
7886
```
7987

8088
If you run into issue with PowerShell script file not being digitally signed, you can execute below command:
8189

8290
```
83-
powershell.exe -ExecutionPolicy Bypass -File ".\resourdedeployment.ps1"
91+
powershell.exe -ExecutionPolicy Bypass -File ".\resourcedeployment.ps1"
8492
```
8593

8694
You will be prompted for the following parameters with this Screen :
@@ -140,10 +148,13 @@ Don't miss this Url information. This is the application's endpoint URL and it s
140148
| text-embedding-3-large | 200K TPM |
141149
142150
151+
> **⚠️ Warning:** **Insufficient quota can cause failures during the upload process.** Please ensure you have the recommended capacity or request for additional capacity before start uploading the files.
152+
153+
143154
1. Browse to Azure OpenAI Studio and select **each of the 2 models** within the `Deployments` menu:
144155
<img src="./Images/readme_deployment/Control_Model_TPM000.png" alt="Select Model" width="700">
145156
146-
1. Increase the TPM value for **each model** for faster report generation:
157+
2. Increase the TPM value for **each model** for faster report generation:
147158
<img src="./Images/readme_deployment/Control_Model_TPM001.png" alt="Set Token per minute" width="700">
148159
149160
### 2. Data Uploading and Processing

0 commit comments

Comments
 (0)