提交 e08be90e 编写于 作者: J Jared Parsons

Protect against accidental merges to master

上级 783aeb06
# This script is meant to guard against accidental merges of our core
# branches. For instance it should guard against future -> master merges
# that weren't intended.
if (${env:ghprbTargetBranch} -eq "master") {
[string]$output = git branch --contains 00677493dc69ceac4e9e4c01a73be90c75e7d340
if ($output.Length -ne 0) {
write-host "Error!!! Accidental merge of future into master"
exit 1
}
}
...@@ -38,6 +38,8 @@ if defined Perf ( ...@@ -38,6 +38,8 @@ if defined Perf (
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat" || goto :BuildFailed call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat" || goto :BuildFailed
powershell -noprofile -executionPolicy RemoteSigned -command "%RoslynRoot%\build\scripts\check-branch.ps1" || goto :BuildFailed
REM Restore the NuGet packages REM Restore the NuGet packages
if "%BuildRestore%" == "true" ( if "%BuildRestore%" == "true" (
call "%RoslynRoot%\Restore.cmd" || goto :BuildFailed call "%RoslynRoot%\Restore.cmd" || goto :BuildFailed
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册