Skip to content

Restore main branch insertions #11737

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 17, 2025
Merged

Restore main branch insertions #11737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 0 additions & 10 deletions azure-pipelines/vs-insertion-experimental.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@
trigger: none
name: $(Date:yyyyMMdd).$(Rev:r)

# Since our release branch is the one flowing into main
# we will keep our main experimental insertions to make sure everything is alright
schedules:
- cron: '0 3 * * 1,3,5' # Runs every Monday, Wednesday and Friday at 3AM UTC
displayName: Experimental VS insertion main
branches:
include:
- main
always: false # Don't run if there are no code changes

resources:
pipelines:
- pipeline: 'MSBuild'
Expand Down
16 changes: 8 additions & 8 deletions azure-pipelines/vs-insertion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ trigger: none
pr: none
name: $(Date:yyyyMMdd).$(Rev:r)

# schedules:
# - cron: '0 3 * * 1-5' # Runs every weekday at 3AM UTC
# displayName: Daily VS insertion main
# branches:
# include:
# - main
# always: false # Don't run if there are no code changes
schedules:
- cron: '0 3 * * 1-5' # Runs every weekday at 3AM UTC
displayName: Daily VS insertion main
branches:
include:
- main
always: false # Don't run if there are no code changes

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