Skip to content

Commit 00dacd7

Browse files
committed
Update infra configs after merging 17.15 into main
1 parent 4c4a07c commit 00dacd7

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

.github/workflows/main-merge.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
name: Inter-branch merge
44
on:
5-
schedule:
6-
# Create a merge every 3 hours (works only for merges from `main`, others would need a `push` trigger).
7-
- cron: '0 */3 * * *'
5+
# schedule:
6+
# # Create a merge every 3 hours (works only for merges from `main`, others would need a `push` trigger).
7+
# - cron: '0 */3 * * *'
88
workflow_dispatch:
99
inputs:
1010
configuration_file_branch:

eng/config/PublishData.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,6 @@
178178
"insertionTitlePrefix": "[d17.14 P3]",
179179
"insertionCreateDraftPR": false
180180
},
181-
"release/dev17.15": {
182-
"nugetKind": [
183-
"Shipping",
184-
"NonShipping"
185-
],
186-
"vsBranch": "feature/d18initial",
187-
"vsMajorVersion": 17,
188-
"insertionTitlePrefix": "[d17.15 P1 initial]",
189-
"insertionCreateDraftPR": false
190-
},
191181
"main": {
192182
"nugetKind": [
193183
"Shipping",

eng/config/branch-merge.jsonc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Used by .github/workflows/main-merge.yml
22
{
33
"merge-flow-configurations": {
4-
"main": {
5-
"MergeToBranch": "release/dev17.15",
6-
"ExtraSwitches": "-QuietComments"
7-
}
4+
// "main": {
5+
// "MergeToBranch": "release/dev17.15",
6+
// "ExtraSwitches": "-QuietComments"
7+
// }
88
}
99
}

0 commit comments

Comments
 (0)