Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR maintenance] [Hub Generated] Review request for Microsoft.Maintenance to add version preview/2021-04-01-preview #4354

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/autogenerateBatch0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
run: |
git checkout autogenerate
git pull
git merge --no-commit --no-ff --strategy-option=theirs origin/master --allow-unrelated-histories
git merge --no-commit --no-ff --strategy-option=theirs origin/main --allow-unrelated-histories
if ! git diff-index --quiet HEAD --; then
git commit -m "Merge remote-tracking branch 'origin/master' into autogenerate"
git commit -m "Merge remote-tracking branch 'origin/main' into autogenerate"
git push origin autogenerate
fi

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
pull_request:
branches: [ master ]
branches: [ main ]
jobs:
build:
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions azure-pipelines-autogen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ jobs:
set -Eeuxo pipefail
git checkout $(Build.SourceBranchName)
git pull
git merge --no-commit --no-ff --strategy-option=theirs origin/master
git merge --no-commit --no-ff --strategy-option=theirs origin/main
if ! git diff-index --quiet HEAD --; then
git commit -m "Merge remote-tracking branch 'origin/master' into $(Build.SourceBranchName)"
git commit -m "Merge remote-tracking branch 'origin/main' into $(Build.SourceBranchName)"
git push origin $(Build.SourceBranchName)
fi
displayName: Integrate master branch
displayName: Integrate main branch

- script: |
set -Eeuxo pipefail
Expand Down
2 changes: 1 addition & 1 deletion generator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ View the Pipeline Configuration [here](/azure-pipelines-autogen.yml).
#### Merging Pipeline-generated schemas

1. Review the status badge on this page to ensure the latest run was successful.
2. Create a Pull Request from [`autogenerate`](https://github.com/Azure/azure-resource-manager-schemas/tree/autogenerate) to [`master`](https://github.com/Azure/azure-resource-manager-schemas/tree/master).
2. Create a Pull Request from [`autogenerate`](https://github.com/Azure/azure-resource-manager-schemas/tree/autogenerate) to [`main`](https://github.com/Azure/azure-resource-manager-schemas/tree/main).
3. If there are any modifications to [schemas/common/autogeneratedResources.json](/schemas/common/autogeneratedResources.json), push a commit to the autogenerate branch to make any corresponding changes to [schemas/2014-04-01-preview/deploymentTemplate.json](/schemas/2014-04-01-preview/deploymentTemplate.json) and [schemas/2015-01-01/deploymentTemplate.json](/schemas/2015-01-01/deploymentTemplate.json).

#### Onboarding to the autogeneration pipeline
Expand Down
2 changes: 1 addition & 1 deletion generator/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
"$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
"name": "azure-schema-generator",
"private": true,
"version": "1.0.0",
Expand Down
6 changes: 3 additions & 3 deletions schemas/2021-04-01-preview/Microsoft.Maintenance.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"name": {
"type": "string",
"description": "Resource Identifier"
"description": "Maintenance Configuration Name"
},
"properties": {
"oneOf": [
Expand Down Expand Up @@ -415,7 +415,7 @@
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Gets or sets the visibility of the configuration."
"description": "Gets or sets the visibility of the configuration. The default value is 'Custom'."
}
},
"description": "Properties for maintenance configuration"
Expand All @@ -433,7 +433,7 @@
},
"recurEvery": {
"type": "string",
"description": "Rate at which a Maintenance window is expected to recur. The rate can be expressed as daily, weekly, or monthly schedules. Daily schedule are formatted as recurEvery: [Frequency as integer]['Day(s)']. If no frequency is provided, the default frequency is 1. Daily schedule examples are recurEvery: Day, recurEvery: 3Days. Weekly schedule are formatted as recurEvery: [Frequency as integer]['Week(s)'] [Optional comma separated list of weekdays Monday-Sunday]. Weekly schedule examples are recurEvery: 3Weeks, recurEvery: Week Saturday,Sunday. Monthly schedules are formatted as [Frequency as integer]['Month(s)'] [Comma separated list of month days] or [Frequency as integer]['Month(s)'] [Week of Month (First, Second, Third, Fourth, Last)] [Weekday Monday-Sunday]. Monthly schedule examples are recurEvery: Month, recurEvery: 2Months, recurEvery: Month day23,day24, recurEvery: Month Last Sunday, recurEvery: Month Fourth Monday."
"description": "Rate at which a Maintenance window is expected to recur. The rate can be expressed as daily, weekly, or monthly schedules. Daily schedule are formatted as recurEvery: [Frequency as integer]['Day(s)']. If no frequency is provided, the default frequency is 1. Daily schedule examples are recurEvery: Day, recurEvery: 3Days. Weekly schedule are formatted as recurEvery: [Frequency as integer]['Week(s)'] [Optional comma separated list of weekdays Monday-Sunday]. Weekly schedule examples are recurEvery: 3Weeks, recurEvery: Week Saturday,Sunday. Monthly schedules are formatted as [Frequency as integer]['Month(s)'] [Comma separated list of month days] or [Frequency as integer]['Month(s)'] [Week of Month (First, Second, Third, Fourth, Last)] [Weekday Monday-Sunday] [Optional Offset(No. of days)]. Offset value must be between -6 to 6 inclusive. Monthly schedule examples are recurEvery: Month, recurEvery: 2Months, recurEvery: Month day23,day24, recurEvery: Month Last Sunday, recurEvery: Month Fourth Monday, recurEvery: Month Last Sunday Offset-3, recurEvery: Month Third Sunday Offset6."
},
"startDateTime": {
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion swagger_to_sdk_config.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
"$schema": "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/documentation/sdkautomation/SwaggerToSdkConfigSchema.json",
"initOptions": {
"initScript": {
"path": ".sdkauto/initScript.sh"
Expand Down