Skip to content

Commit 56af147

Browse files
authored
Revert "[automated] Merge branch 'vs17.14' => 'main' (#11562)" (#11737)
This reverts commit dd2f7ad, reversing changes made to af0a20f.
1 parent f71a751 commit 56af147

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

azure-pipelines/vs-insertion-experimental.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
trigger: none
33
name: $(Date:yyyyMMdd).$(Rev:r)
44

5-
# Since our release branch is the one flowing into main
6-
# we will keep our main experimental insertions to make sure everything is alright
7-
schedules:
8-
- cron: '0 3 * * 1,3,5' # Runs every Monday, Wednesday and Friday at 3AM UTC
9-
displayName: Experimental VS insertion main
10-
branches:
11-
include:
12-
- main
13-
always: false # Don't run if there are no code changes
14-
155
resources:
166
pipelines:
177
- pipeline: 'MSBuild'

azure-pipelines/vs-insertion.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ trigger: none
1212
pr: none
1313
name: $(Date:yyyyMMdd).$(Rev:r)
1414

15-
# schedules:
16-
# - cron: '0 3 * * 1-5' # Runs every weekday at 3AM UTC
17-
# displayName: Daily VS insertion main
18-
# branches:
19-
# include:
20-
# - main
21-
# always: false # Don't run if there are no code changes
15+
schedules:
16+
- cron: '0 3 * * 1-5' # Runs every weekday at 3AM UTC
17+
displayName: Daily VS insertion main
18+
branches:
19+
include:
20+
- main
21+
always: false # Don't run if there are no code changes
2222

2323
resources:
2424
pipelines:
@@ -66,7 +66,7 @@ variables:
6666
# `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS
6767
- name: AutoInsertTargetBranch
6868
${{ if eq(variables['Build.SourceBranchName'], 'vs17.14') }}:
69-
value: 'main'
69+
value: 'rel/d17.14'
7070
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.13') }}:
7171
value: 'rel/d17.13'
7272
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.12') }}:

0 commit comments

Comments
 (0)