Skip to content

Commit 1676dec

Browse files
authored
Merge release/dev17.13 to main (#11221)
This is an automatically generated pull request from release/dev17.13 into main. Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯 ## Troubleshooting conflicts ### Identify authors of changes which introduced merge conflicts Scroll to the bottom, then for each file containing conflicts copy its path into the following searches: - https://github.com/dotnet/razor/find/release/dev17.13 - https://github.com/dotnet/razor/find/main Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts. ### Resolve merge conflicts using your local repo Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub. ``` bash git fetch --all git checkout -t upstream/merges/release/dev17.13-to-main git reset --hard upstream/main git merge upstream/release/dev17.13 # Fix merge conflicts git commit git push upstream merges/release/dev17.13-to-main --force ```
2 parents e85c2f8 + f556e9a commit 1676dec

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

azure-pipelines-official.yml

+14-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,18 @@ pr:
4949
include:
5050
- '*'
5151

52+
schedules:
53+
- cron: "0 8 23-29 * 0" # Fourth Sunday of each month at 8:00 UTC
54+
displayName: "Monthly smoke test"
55+
branches:
56+
include:
57+
- main
58+
- release/*
59+
exclude:
60+
- ""
61+
always: true # Run even if there have been no source code changes since the last successful scheduled run
62+
batch: false # Do not run the pipeline if the previously scheduled run is in-progress
63+
5264
resources:
5365
repositories:
5466
- repository: 1ESPipelineTemplates
@@ -205,8 +217,9 @@ extends:
205217
-sign
206218
$(_BuildArgs)
207219
$(_PublishArgs)
220+
/p:DeployExtension=false
208221
name: Build
209-
displayName: Build and Deploy
222+
displayName: Build
210223
condition: succeeded()
211224

212225
- script: eng\CIBuild.cmd

0 commit comments

Comments
 (0)