Skip to content

Commit 18de66f

Browse files
committed
fixing merge conflicts
2 parents 220bc0e + a948c4e commit 18de66f

File tree

16,844 files changed

+342403
-297906
lines changed

Some content is hidden

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

16,844 files changed

+342403
-297906
lines changed

.github/policies/disallow-edits.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,19 @@ configuration:
153153

154154
- description: Disallow sign-off for articles in the /articles/reliability folder.
155155
if:
156-
# If a 'sign-off' comment is added to a PR in the articles/reliability folder , and the PR author isn't Anastasia or John...
157-
- payloadType: Issue_Comment
158-
- isPullRequest
159-
- filesMatchPattern:
160-
matchAny: true
161-
pattern: articles/reliability/*
156+
# If a 'sign-off' comment is added to a PR that's assigned to anaharris-ms, and the PR author isn't Anastasia or John...
157+
- or:
158+
- payloadType: Issue_Comment
159+
- payloadType: Pull_Request_Review_Comment
160+
- isAction:
161+
action: Created
162+
- isActivitySender:
163+
issueAuthor: True
164+
- isAssignedToUser:
165+
user: anaharris-ms
162166
- commentContains:
163-
pattern: \#sign-off
164-
isRegex: false
167+
pattern: '#sign-off'
168+
isRegex: False
165169
- not:
166170
or:
167171
- isActivitySender:
@@ -181,14 +185,14 @@ configuration:
181185
- description: Write a message if the breadcrumb file is modified in the azure-docs-pr repository.
182186
if:
183187
- payloadType: Pull_Request
184-
- isAction:
185-
action: Opened
186-
- filesMatchPattern:
188+
- isAction:
189+
action: Opened
190+
- filesMatchPattern:
187191
matchAny: true
188192
pattern: bread/*
189193

190194
then:
191195
- addReply:
192196
reply: >-
193-
@${issueAuthor} - This PR modifies the breadcrumb file for the entire repository in this pull request; the breadcrumb supports 100s of services. Please make sure your changes to the breadcrumb file are intentional. Do not delete this file.
197+
@${issueAuthor} - This PR modifies the breadcrumb file for the entire repository: bread/toc.yml. This file supports the on-site navigation for 100s of services. Please make sure your changes to the breadcrumb file are intentional. Do not delete this file.
194198

.github/workflows/stale.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Mark stale pull requests
2+
3+
permissions:
4+
issues: write
5+
pull-requests: write
6+
7+
on:
8+
schedule:
9+
- cron: "0 */6 * * *"
10+
11+
jobs:
12+
stale:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/stale@v3
18+
with:
19+
repo-token: ${{ secrets.GITHUB_TOKEN }}
20+
days-before-pr-stale: 14
21+
days-before-pr-close: 90
22+
stale-pr-label: inactive
23+
close-pr-label: auto-close
24+
exempt-pr-labels: keep-open
25+
operations-per-run: 1300
26+
ascending: false
27+
# start-date: '2021-03-19'
28+
stale-pr-message: >
29+
This pull request has been inactive for at least 14 days.
30+
31+
If you are finished with your changes, don't forget to sign off. See the [platform guide](https://review.learn.microsoft.com/help/platform/prmerger-hashtag-commands?branch=main) for instructions.
32+
33+
[Get Help](https://review.learn.microsoft.com/help/platform/help-options?branch=main)
34+
35+
[Learn Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)
36+
37+
[Resolve Merge Conflicts](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
38+
close-pr-message: >
39+
This pull request has been inactive for 90 days, and an `auto-close` label has been added. At this time, the system is closing the PR automatically. If you decide to continue working on your changes, scroll to the bottom of the pull request comments and select the **Reopen pull request** button.
40+
<br/>

.gitignore

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,23 @@ AzureMigration.ps1
2626
*.pdn
2727

2828
# Pycharm
29-
.idea/*
29+
.idea/*
30+
articles/planetary-computer/doc-tree-generator.py
31+
.gitignore
32+
articles/planetary-computer/article_links_diagram.md
33+
articles/planetary-computer/index_helper.py
34+
articles/planetary-computer/metadata_index.csv
35+
articles/planetary-computer/broken_link_checker.py
36+
articles/planetary-computer/broken_links_external.csv
37+
articles/planetary-computer/broken_links.csv
38+
articles/planetary-computer/check_orphaned_docs.py
39+
40+
# Python cache files
41+
*.pyc
42+
__pycache__/
43+
articles/planetary-computer/interesting_stats.py
44+
articles/planetary-computer/locate_text.py
45+
articles/planetary-computer/image_syntax_checker.py
46+
articles/planetary-computer/image-file-fixer.py
47+
articles/planetary-computer/orphaned-media.py
48+
articles/planetary-computer/orphaned_media_files.txt

.openpublishing.publish.config.json

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,30 @@
140140
"branch": "main",
141141
"branch_mapping": {}
142142
},
143+
{
144+
"path_to_root": "remote-mcp-functions-dotnet",
145+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-dotnet",
146+
"branch": "main",
147+
"branch_mapping": {}
148+
},
149+
{
150+
"path_to_root": "remote-mcp-functions-typescript",
151+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-typescript",
152+
"branch": "main",
153+
"branch_mapping": {}
154+
},
155+
{
156+
"path_to_root": "remote-mcp-functions-python",
157+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-python",
158+
"branch": "main",
159+
"branch_mapping": {}
160+
},
161+
{
162+
"path_to_root": "remote-mcp-functions-java",
163+
"url": "https://github.com/Azure-Samples/remote-mcp-functions-java",
164+
"branch": "main",
165+
"branch_mapping": {}
166+
},
143167
{
144168
"path_to_root": "azure-functions-durable-js",
145169
"url": "https://github.com/Azure/azure-functions-durable-js",
@@ -158,6 +182,12 @@
158182
"branch": "dev",
159183
"branch_mapping": {}
160184
},
185+
{
186+
"path_to_root": "azure-functions-mongodb-extension",
187+
"url": "https://github.com/Azure/Azure-functions-mongodb-extension",
188+
"branch": "main",
189+
"branch_mapping": {}
190+
},
161191
{
162192
"path_to_root": "azure-functions-nodejs-v4",
163193
"url": "https://github.com/Azure/azure-functions-nodejs-samples",
@@ -242,12 +272,6 @@
242272
"branch": "main",
243273
"branch_mapping": {}
244274
},
245-
{
246-
"path_to_root": "azure-proactive-resiliency-library",
247-
"url": "https://github.com/Azure/Azure-Proactive-Resiliency-Library",
248-
"branch": "main",
249-
"branch_mapping": {}
250-
},
251275
{
252276
"path_to_root": "azure-sdk-for-go-samples",
253277
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
@@ -590,6 +614,12 @@
590614
"branch": "main",
591615
"branch_mapping": {}
592616
},
617+
{
618+
"path_to_root": "laravel-tasks",
619+
"url": "https://github.com/Azure-Samples/laravel-tasks",
620+
"branch": "main",
621+
"branch_mapping": {}
622+
},
593623
{
594624
"path_to_root": "playwright-testing-service",
595625
"url": "https://github.com/microsoft/playwright-testing-service",

0 commit comments

Comments
 (0)