Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
koderover
zadig
提交
d97366df
zadig
项目概览
koderover
/
zadig
9 个月 前同步成功
通知
10
Star
2407
Fork
754
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
zadig
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
d97366df
编写于
8月 03, 2023
作者:
M
M-Cosmosss
提交者:
GitHub
8月 03, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: gitlab trigger error when push a new branch (#2910)
Signed-off-by:
N
M-Cosmosss
<
yuzhou@koderover.com
>
上级
dc4b8436
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
18 deletion
+39
-18
pkg/microservice/aslan/core/workflow/service/webhook/gitlab_workflow_task.go
...lan/core/workflow/service/webhook/gitlab_workflow_task.go
+19
-9
pkg/microservice/aslan/core/workflow/service/webhook/gitlab_workflowv4_task.go
...n/core/workflow/service/webhook/gitlab_workflowv4_task.go
+20
-9
未找到文件。
pkg/microservice/aslan/core/workflow/service/webhook/gitlab_workflow_task.go
浏览文件 @
d97366df
...
@@ -232,15 +232,25 @@ func (gpem *gitlabPushEventMatcher) Match(hookRepo *commonmodels.MainHookRepo) (
...
@@ -232,15 +232,25 @@ func (gpem *gitlabPushEventMatcher) Match(hookRepo *commonmodels.MainHookRepo) (
return
false
,
err
return
false
,
err
}
}
// compare接口获取两个commit之间的最终的改动
// When push a new branch, ev.Before will be a lot of "0"
diffs
,
err
:=
client
.
Compare
(
ev
.
ProjectID
,
ev
.
Before
,
ev
.
After
)
// So we should not use Compare
if
err
!=
nil
{
if
strings
.
Count
(
ev
.
Before
,
"0"
)
==
len
(
ev
.
Before
)
{
gpem
.
log
.
Errorf
(
"Failed to get push event diffs, error: %s"
,
err
)
for
_
,
commit
:=
range
ev
.
Commits
{
return
false
,
err
changedFiles
=
append
(
changedFiles
,
commit
.
Added
...
)
}
changedFiles
=
append
(
changedFiles
,
commit
.
Removed
...
)
for
_
,
diff
:=
range
diffs
{
changedFiles
=
append
(
changedFiles
,
commit
.
Modified
...
)
changedFiles
=
append
(
changedFiles
,
diff
.
NewPath
)
}
changedFiles
=
append
(
changedFiles
,
diff
.
OldPath
)
}
else
{
// compare接口获取两个commit之间的最终的改动
diffs
,
err
:=
client
.
Compare
(
ev
.
ProjectID
,
ev
.
Before
,
ev
.
After
)
if
err
!=
nil
{
gpem
.
log
.
Errorf
(
"Failed to get push event diffs, error: %s"
,
err
)
return
false
,
err
}
for
_
,
diff
:=
range
diffs
{
changedFiles
=
append
(
changedFiles
,
diff
.
NewPath
)
changedFiles
=
append
(
changedFiles
,
diff
.
OldPath
)
}
}
}
if
gpem
.
isYaml
{
if
gpem
.
isYaml
{
serviceChangeds
:=
ServicesMatchChangesFiles
(
gpem
.
trigger
.
Rules
.
MatchFolders
,
changedFiles
)
serviceChangeds
:=
ServicesMatchChangesFiles
(
gpem
.
trigger
.
Rules
.
MatchFolders
,
changedFiles
)
...
...
pkg/microservice/aslan/core/workflow/service/webhook/gitlab_workflowv4_task.go
浏览文件 @
d97366df
...
@@ -20,6 +20,7 @@ import (
...
@@ -20,6 +20,7 @@ import (
"fmt"
"fmt"
"regexp"
"regexp"
"strconv"
"strconv"
"strings"
"github.com/hashicorp/go-multierror"
"github.com/hashicorp/go-multierror"
"github.com/xanzy/go-gitlab"
"github.com/xanzy/go-gitlab"
...
@@ -193,15 +194,25 @@ func (gpem *gitlabPushEventMatcherForWorkflowV4) Match(hookRepo *commonmodels.Ma
...
@@ -193,15 +194,25 @@ func (gpem *gitlabPushEventMatcherForWorkflowV4) Match(hookRepo *commonmodels.Ma
return
false
,
err
return
false
,
err
}
}
// compare接口获取两个commit之间的最终的改动
// When push a new branch, ev.Before will be a lot of "0"
diffs
,
err
:=
client
.
Compare
(
ev
.
ProjectID
,
ev
.
Before
,
ev
.
After
)
// So we should not use Compare
if
err
!=
nil
{
if
strings
.
Count
(
ev
.
Before
,
"0"
)
==
len
(
ev
.
Before
)
{
gpem
.
log
.
Errorf
(
"Failed to get push event diffs, error: %s"
,
err
)
for
_
,
commit
:=
range
ev
.
Commits
{
return
false
,
err
changedFiles
=
append
(
changedFiles
,
commit
.
Added
...
)
}
changedFiles
=
append
(
changedFiles
,
commit
.
Removed
...
)
for
_
,
diff
:=
range
diffs
{
changedFiles
=
append
(
changedFiles
,
commit
.
Modified
...
)
changedFiles
=
append
(
changedFiles
,
diff
.
NewPath
)
}
changedFiles
=
append
(
changedFiles
,
diff
.
OldPath
)
}
else
{
// compare接口获取两个commit之间的最终的改动
diffs
,
err
:=
client
.
Compare
(
ev
.
ProjectID
,
ev
.
Before
,
ev
.
After
)
if
err
!=
nil
{
gpem
.
log
.
Errorf
(
"Failed to get push event diffs, error: %s"
,
err
)
return
false
,
err
}
for
_
,
diff
:=
range
diffs
{
changedFiles
=
append
(
changedFiles
,
diff
.
NewPath
)
changedFiles
=
append
(
changedFiles
,
diff
.
OldPath
)
}
}
}
if
gpem
.
isYaml
{
if
gpem
.
isYaml
{
serviceChangeds
:=
ServicesMatchChangesFiles
(
gpem
.
trigger
.
Rules
.
MatchFolders
,
changedFiles
)
serviceChangeds
:=
ServicesMatchChangesFiles
(
gpem
.
trigger
.
Rules
.
MatchFolders
,
changedFiles
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录