Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
b1fc72ed
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b1fc72ed
编写于
11月 17, 2016
作者:
B
Brett V. Forsgren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
if PR creation fails due to no changes, swallow the error
上级
3dcd2c06
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
52 addition
and
23 deletion
+52
-23
src/Tools/Github/GitMergeBot/GitHubRepository.cs
src/Tools/Github/GitMergeBot/GitHubRepository.cs
+52
-23
未找到文件。
src/Tools/Github/GitMergeBot/GitHubRepository.cs
浏览文件 @
b1fc72ed
...
...
@@ -49,32 +49,39 @@ git commit
Once all conflicts are resolved and all the tests pass, you are free to merge the pull request.
"
.
Trim
();
var
pullRequest
=
await
_client
.
PullRequest
.
Create
(
owner
:
destinationOwner
,
name
:
RepositoryName
,
newPullRequest
:
new
NewPullRequest
(
title
:
title
,
head
:
$"
{
UserName
}
:
{
pullRequestBranch
}
"
,
baseRef
:
destinationBranch
)
try
{
var
pullRequest
=
await
_client
.
PullRequest
.
Create
(
owner
:
destinationOwner
,
name
:
RepositoryName
,
newPullRequest
:
new
NewPullRequest
(
title
:
title
,
head
:
$"
{
UserName
}
:
{
pullRequestBranch
}
"
,
baseRef
:
destinationBranch
)
{
Body
=
prMessage
}
);
// The reason for this delay is twofold:
//
// * Github has a bug in which it can "create" a pull request without that pull request
// being able to be commented on for a short period of time.
// * The Jenkins "comment watcher" has a bug whereby any comment posted shortly after
// pull-request creation is ignored.
//
// Thus, this delay sidesteps both of those bugs by asking for a VSI test 30 seconds after
// the creation of the PR. Ugly, yes; but the only *real* way to sidestep this would be to
// 1) Fix github, 2) Fix jenkins, and while those might be lofty goals, they are not in the
// scope of this PR.
await
Task
.
Delay
(
TimeSpan
.
FromSeconds
(
30.0
));
await
_client
.
Issue
.
Comment
.
Create
(
destinationOwner
,
RepositoryName
,
pullRequest
.
Number
,
"@dotnet-bot test vsi please"
);
);
// The reason for this delay is twofold:
//
// * Github has a bug in which it can "create" a pull request without that pull request
// being able to be commented on for a short period of time.
// * The Jenkins "comment watcher" has a bug whereby any comment posted shortly after
// pull-request creation is ignored.
//
// Thus, this delay sidesteps both of those bugs by asking for a VSI test 30 seconds after
// the creation of the PR. Ugly, yes; but the only *real* way to sidestep this would be to
// 1) Fix github, 2) Fix jenkins, and while those might be lofty goals, they are not in the
// scope of this PR.
await
Task
.
Delay
(
TimeSpan
.
FromSeconds
(
30.0
));
await
_client
.
Issue
.
Comment
.
Create
(
destinationOwner
,
RepositoryName
,
pullRequest
.
Number
,
"@dotnet-bot test vsi please"
);
}
catch
(
Exception
ex
)
when
(
DidPullRequestFailDueToNoChanges
(
ex
))
{
Console
.
WriteLine
(
"There were no commits between the specified branchs. Pull request not created."
);
}
}
/// <returns>The existing open merge PRs.</returns>
...
...
@@ -91,5 +98,27 @@ private async Task<IList<PullRequest>> GetExistingMergePrsAsync(string newBranch
return
openPrs
;
}
/// <summary>
/// The Octokit API fails on pull request creation if the PR would have been empty, but there is no way
/// to know that ahead of time.
///
/// The fall-back is to check for a very specific "failure".
/// </summary>
private
static
bool
DidPullRequestFailDueToNoChanges
(
Exception
ex
)
{
if
(!(
ex
is
ApiValidationException
apiException
))
{
return
false
;
}
if
(
apiException
.
ApiError
.
Errors
.
Count
!=
1
)
{
return
false
;
}
var
error
=
apiException
.
ApiError
.
Errors
.
Single
();
return
error
.
Message
.
StartsWith
(
"No commits between"
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录