Skip to content

Commit 965253e

Browse files
Merge pull request microsoft#124 from microsoft/main
Downmerge from main to dev
2 parents a0f2d63 + 8d2a208 commit 965253e

File tree

5 files changed

+99
-22
lines changed

5 files changed

+99
-22
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Lines starting with '#' are comments.
2+
# Each line is a file pattern followed by one or more owners.
3+
4+
# These owners will be the default owners for everything in the repo.
5+
* @toherman-msft @hunterjam @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft

.github/dependabot.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,20 @@
55

66
version: 2
77
updates:
8-
- package-ecosystem: "pip" # See documentation for possible values
9-
directory: "/" # Location of package manifests
8+
- package-ecosystem: "npm" # for frontend dependencies
9+
directory: "/frontend"
1010
schedule:
11-
interval: "weekly"
11+
interval: "monthly"
12+
commit-message:
13+
prefix: "build"
14+
target-branch: "dependabotchanges"
15+
open-pull-requests-limit: 10
16+
17+
- package-ecosystem: "pip" # for backend dependencies
18+
directory: "/"
19+
schedule:
20+
interval: "monthly"
21+
commit-message:
22+
prefix: "build"
23+
target-branch: "dependabotchanges"
24+
open-pull-requests-limit: 10

.github/pull_request_template.md

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,40 @@
1-
### Motivation and Context
2-
3-
<!-- Thank you for your contribution to this repo!
4-
Please help reviewers and future users, providing the following information:
5-
1. Why is this change required?
6-
2. What problem does it solve?
7-
3. What scenario does it contribute to?
8-
4. If it fixes an open issue, please link to the issue here.
9-
5. Does this solve an issue or add a feature that *all* users of this sample app can benefit from? Contributions will only be accepted that apply across all users of this app.
10-
-->
1+
## Purpose
2+
<!-- Describe the intention of the changes being proposed. What problem does it solve or functionality does it add? -->
3+
* ...
114

12-
### Description
5+
## Does this introduce a breaking change?
6+
<!-- Mark one with an "x". -->
137

14-
<!-- Describe your changes, the overall approach, the underlying design.
15-
These notes will help understanding how your code works. Thanks! -->
8+
- [ ] Yes
9+
- [ ] No
1610

11+
<!-- Please prefix your PR title with one of the following:
12+
* `feat`: A new feature
13+
* `fix`: A bug fix
14+
* `docs`: Documentation only changes
15+
* `style`: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
16+
* `refactor`: A code change that neither fixes a bug nor adds a feature
17+
* `perf`: A code change that improves performance
18+
* `test`: Adding missing tests or correcting existing tests
19+
* `build`: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
20+
* `ci`: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
21+
* `chore`: Other changes that don't modify src or test files
22+
* `revert`: Reverts a previous commit
23+
* !: A breaking change is indicated with a `!` after the listed prefixes above, e.g. `feat!`, `fix!`, `refactor!`, etc.
24+
-->
1725

18-
### Contribution Checklist
26+
## Golden Path Validation
27+
- [ ] I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.
1928

20-
<!-- Before submitting this PR, please make sure: -->
29+
## Deployment Validation
30+
- [ ] I have validated the deployment process successfully and all services are running as expected with this change.
2131

32+
## What to Check
33+
Verify that the following are valid
2234
- [ ] I have built and tested the code locally and in a deployed app
2335
- [ ] For frontend changes, I have pulled the latest code from main, built the frontend, and committed all static files.
2436
- [ ] This is a change for all users of this app. No code or asset is specific to my use case or my organization.
25-
- [ ] I didn't break any existing functionality :smile:
37+
38+
39+
## Other Information
40+
<!-- Add any other helpful information that may be needed here.. -->
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Sync Main to dependabotchanges
2+
3+
on:
4+
# Schedule the sync job to run daily or customize as needed
5+
schedule:
6+
- cron: '0 1 * * *' # Runs every day at 1 AM UTC
7+
# Trigger the sync job on pushes to the main branch
8+
push:
9+
branches:
10+
- main
11+
12+
jobs:
13+
sync:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v3
19+
with:
20+
fetch-depth: 0 # Fetch all history for accurate branch comparison
21+
22+
- name: Configure Git
23+
run: |
24+
git config user.name "github-actions[bot]"
25+
git config user.email "github-actions[bot]@users.noreply.github.com"
26+
27+
- name: Sync main to dependabotchanges
28+
run: |
29+
# Ensure we're on the main branch
30+
git checkout main
31+
# Fetch the latest changes
32+
git pull origin main
33+
34+
# Switch to dependabotchanges branch
35+
git checkout dependabotchanges
36+
# Merge main branch changes
37+
git merge main --no-edit
38+
39+
# Push changes back to dependabotchanges1 branch
40+
git push origin dependabotchanges
41+
42+
- name: Notify on Failure
43+
if: failure()
44+
run: echo "Sync from main to dependabotchanges failed!"

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
azure-identity==1.17.1
22
# Flask[async]==2.3.2
3-
openai==1.6.1
3+
openai==1.55.3
44
azure-search-documents==11.4.0b6
55
azure-storage-blob==12.17.0
66
python-dotenv==1.0.0
77
azure-cosmos==4.7.0
8-
quart==0.19.4
8+
quart==0.19.9
99
uvicorn==0.24.0
1010
aiohttp==3.10.5
1111
gunicorn==20.1.0
12-
pydantic-settings==2.2.1
12+
pydantic-settings==2.2.1

0 commit comments

Comments
 (0)