Skip to content

Commit

Permalink
Merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
Pacodel committed Sep 30, 2020
2 parents f3cf75a + 3695f4e commit 4348ed0
Show file tree
Hide file tree
Showing 656 changed files with 78,421 additions and 8,564 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines/SDKAutomation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
SDK_REPO_NAME: azure-sdk-for-go
Trenton:
SDK_REPO_NAME: azure-sdk-for-trenton
${{ if eq(variables['ENABLE_RESOURCE_MANAGER_SCHEMAS'], 'true') }}:
Schema:
SDK_REPO_NAME: azure-resource-manager-schemas
steps:
Expand Down Expand Up @@ -80,6 +79,7 @@ jobs:
-e AZURE_DEVOPS_EXT_PAT \
-e BUILD_ID \
sdk-automation:latest npm start
condition: or(ne(variables['SDK_REPO_NAME'], 'azure-resource-manager-schemas'), endsWith(variables['SPEC_REPO'], '/azure-rest-api-specs'))
env:
BLOB_STORAGE_NAME: $(blob-storage-name)
BLOB_STORAGE_KEY: $(blob-storage-key)
Expand Down
33 changes: 33 additions & 0 deletions .github/comment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
- rule:
type: checkbox
keywords:
- "Removing API(s)"
- "Updating API in stable version"
onCheckedLabels:
- breakingChange

- rule:
type: checkbox
keywords:
- "WaitForARMFeedback"
booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)"
onCheckedLabels:
- WaitForARMFeedback
onCheckedComments: "Hi, @${PRAuthor} your PR are labelled with <b> WaitForARMFeedback</b>. A notification email will be sent out shortly afterwards to notify ARM review board(armapireview@microsoft.com). cc @${PRAssignee} "

- rule:
type: checkbox
keywords:
- "I have reviewed the [documentation](https://aka.ms/ameonboard) for the workflow."
onCheckedComments: "Hi, @${PRAuthor} Thanks for your PR. I am workflow bot for review process. Here are some small tips. </br> <li> Please ensure to do self-check against checklists in first PR comment.</li> <li> PR assignee is the person auto-assigned and responsible for your current PR reviewing and merging. </li> <li> If there is CI failure(s), to fix CI error(s) is mandatory for PR merging; or you need to provide justification in PR comment for explanation. [How to fix?](https://github.com/Azure/azure-rest-api-specs/blob/master/documentation/ci-fix.md)</li></br> Any feedback about review process or workflow bot, pls contact swagger and tools team. vsswagger@microsoft.com"

- rule:
type: label
label: breakingChange
onLabeledComments: "Hi @${PRAuthor}, one or multiple breaking change(s) is detected in your PR. Pls follow [breaking change policy](https://aka.ms/AzBreakingChangesPolicy) to request breaking change review and approval before proceeding swagger PR review. "

- rule:
type: label
label: ApprovedOkToMerge
onLabeledComments: "Hi @${PRAuthor},Your PR is approved. Congratulations. </br> <li> If your PR is in public repo (azure-rest-api-specs), PR assignee will merge all updates in the PR shortly afterwards; or pause the PR merge, you need to put on a label <b>DoNotMerge</b> to PR as soon as possible. </li><li>If your PR is in private repo (azure-rest-api-specs-pr), there won’t be PR merge. Please refer to this [wiki](https://dev.azure.com/azure-sdk/internal/_wiki/wikis/internal.wiki/205/RP-Scenarios-to-Contribute-to-Swagger?anchor=**public-repository-vs.-private-repository**) for further guidance on how to proceed. </li>"
3 changes: 1 addition & 2 deletions .github/issue_assignment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
assignees:
- yungezz
- erich-wang
- NullMDR
- PhoenixHe-msft
- raych1
- lirenhe
- weidongxu-microsoft
Expand All @@ -19,4 +19,3 @@
- qianwens
- ruowan
- MyronFanQiu
- jianyexi
160 changes: 24 additions & 136 deletions .github/pull_request_assignment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,148 +8,36 @@
- jhendrixMSFT
- lmazuel
- tjprescott

- rule:
paths:
- "specification/network/**"
reviewers:
- MyronFanQiu
- lirenhe

- rule:
paths:
- "specification/@(applicationinsights|operationalinsights)/**"
reviewers:
- MyronFanQiu

- rule:
paths: "specification/compute/**"
reviewers:
- ArcturusZhang
- fengzhou-msft
- yungezz

- rule:
paths: "specification/resources/**"
reviewers:
- raych1

- rule:
paths:
- "specification/machinelearningservices/**"
reviewers:
- ArcturusZhang

- rule:
paths:
- "specification/@(azureactivedirectory|appplatform)/**"
reviewers:
- njuCZ

- rule:
paths:
- "specification/authorization/**"
reviewers:
- qianwens
- yungezz

- rule:
paths:
- "specification/datafactory/**"
reviewers:
- qianwens

- rule:
paths:
- "specification/monitor/**"
reviewers:
- weidongxu-microsoft
- MyronFanQiu

- rule:
paths:
- "specification/storage/**"
reviewers:
- qianwens
- Juliehzl

- rule:
paths: "specification/mediaservices/**"
reviewers:

- rule:
paths: "specification/mediaservices/**"
reviewers:
- allenjzhang

- rule:
paths:
- "specification/@(keyvault|notificationhubs)/**"
- "specification/@(databricks|containerregistry)/**"
reviewers:
- fengzhou-msft

- rule:
paths:
- "specification/@(containerservice|containerinstance)/**"
reviewers:
- NullMDR
- fengzhou-msft
- yungezz

- rule:
paths:
- "specification/mixedreality/**"
- "specification/hdinsight/**"
reviewers:
- leni-msft

- rule:
paths:
- "specification/portal/**"
reviewers:
- NullMDR

- rule:
paths:
- "specification/web/**"
reviewers:
- weidongxu-microsoft

- rule:
paths:
- "documentation/**"
reviewers:
- josefree
- akning-ms

- rule:
paths:
- "**/package.json"
- ".github/**"
- "**/azure-pipelines.yml"
- ".azure-pipelines/**"
- ".azure-pipelines-preproduction/**"
reviewers:
- akning-ms
- NullMDR

- rule:
paths:
- "documentation/**"
reviewers:
- josefree
- akning-ms

- rule:
paths:
- "**/package.json"
- ".github/**"
- "**/azure-pipelines.yml"
- ".azure-pipelines/**"
- ".azure-pipelines-preproduction/**"
reviewers:
- akning-ms
- PhoenixHe-msft
- raych1

- rule:
# manager-plane PR
paths:
- "**"
reviewers:
- yungezz
- erich-wang
- NullMDR
- raych1
- lirenhe
- weidongxu-microsoft
- ArcturusZhang
- xccc-msft
- ChenTanyi
- fengzhou-msft
- njuCZ
- akning-ms
- allenjzhang
- markcowl
- leni-msft
- qianwens
- ruowan
- jianyexi

1 change: 0 additions & 1 deletion azure-rest-api-specs
Submodule azure-rest-api-specs deleted from 545a9a
15 changes: 15 additions & 0 deletions cSpell.json
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,21 @@
"mysqldb",
"psqldb"
]
},
{
"filename": "**/specification/maps/data-plane/Microsoft.Maps/Render/preview/1.0/render.json",
"words": [
"Chttp",
"Fcontoso",
"Fpushpins"
]
}
,
{
"filename": "**/specification/communication/data-plane/Microsoft.CommunicationServicesChat/preview/2020-09-21-preview2/communicationserviceschat.json",
"words": [
"readreceipts"
]
}
]
}
Loading

0 comments on commit 4348ed0

Please sign in to comment.