Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
一杯枸杞茶ya
csdn-workflow
提交
7b6f1bab
C
csdn-workflow
项目概览
一杯枸杞茶ya
/
csdn-workflow
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
csdn-workflow
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7b6f1bab
编写于
4月 12, 2021
作者:
T
Tomas Vik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: use project_id from the pipeline instead of the workspace project
上级
fb75debb
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
20 addition
and
28 deletion
+20
-28
src/gitlab_service.ts
src/gitlab_service.ts
+17
-27
src/status_bar.ts
src/status_bar.ts
+1
-1
src/test_utils/entities.ts
src/test_utils/entities.ts
+1
-0
src/types.d.ts
src/types.d.ts
+1
-0
未找到文件。
src/gitlab_service.ts
浏览文件 @
7b6f1bab
...
...
@@ -17,10 +17,6 @@ import { getInstanceUrl as getInstanceUrlUtil } from './utils/get_instance_url';
import
{
GitLabProject
}
from
'
./gitlab/gitlab_project
'
;
import
{
getExtensionConfiguration
}
from
'
./utils/get_extension_configuration
'
;
interface
GitLabPipeline
{
id
:
number
;
}
export
interface
RestJob
{
name
:
string
;
// eslint-disable-next-line camelcase
...
...
@@ -371,30 +367,24 @@ export async function fetchIssuables(params: CustomQuery, workspaceFolder: strin
return
issuable
.
map
(
normalizeAvatarUrl
(
await
getInstanceUrl
()));
}
export
async
function
fetchLastJobsForCurrentBranch
(
pipeline
:
GitLabPipeline
,
workspaceFolder
:
string
,
)
{
const
project
=
await
fetchCurrentPipelineProject
(
workspaceFolder
);
if
(
project
)
{
const
{
response
}
=
await
fetch
(
`/projects/
${
project
.
restId
}
/pipelines/
${
pipeline
.
id
}
/jobs`
);
let
jobs
:
RestJob
[]
=
response
;
// Gitlab return multiple jobs if you retry the pipeline we filter to keep only the last
const
alreadyProcessedJob
=
new
Set
();
jobs
=
jobs
.
sort
((
one
,
two
)
=>
(
one
.
created_at
>
two
.
created_at
?
-
1
:
1
));
jobs
=
jobs
.
filter
(
job
=>
{
if
(
alreadyProcessedJob
.
has
(
job
.
name
))
{
return
false
;
}
alreadyProcessedJob
.
add
(
job
.
name
);
return
true
;
});
return
jobs
;
}
export
async
function
fetchLastJobsForCurrentBranch
(
pipeline
:
RestPipeline
):
Promise
<
RestJob
[]
>
{
const
{
response
}
=
await
fetch
(
`/projects/
${
pipeline
.
project_id
}
/pipelines/
${
pipeline
.
id
}
/jobs`
,
);
let
jobs
:
RestJob
[]
=
response
;
// Gitlab return multiple jobs if you retry the pipeline we filter to keep only the last
const
alreadyProcessedJob
=
new
Set
();
jobs
=
jobs
.
sort
((
one
,
two
)
=>
(
one
.
created_at
>
two
.
created_at
?
-
1
:
1
));
jobs
=
jobs
.
filter
(
job
=>
{
if
(
alreadyProcessedJob
.
has
(
job
.
name
))
{
return
false
;
}
alreadyProcessedJob
.
add
(
job
.
name
);
return
true
;
});
return
null
;
return
jobs
;
}
export
async
function
fetchOpenMergeRequestForCurrentBranch
(
...
...
src/status_bar.ts
浏览文件 @
7b6f1bab
...
...
@@ -102,7 +102,7 @@ export class StatusBar {
if
(
status
===
'
running
'
||
status
===
'
failed
'
)
{
try
{
const
jobs
=
await
gitLabService
.
fetchLastJobsForCurrentBranch
(
pipeline
,
workspaceFolder
!
);
const
jobs
=
await
gitLabService
.
fetchLastJobsForCurrentBranch
(
pipeline
);
if
(
jobs
)
{
statusText
=
createStatusTextFromJobs
(
jobs
,
status
);
}
...
...
src/test_utils/entities.ts
浏览文件 @
7b6f1bab
...
...
@@ -66,5 +66,6 @@ export const pipeline: RestPipeline = {
status
:
'
success
'
,
updated_at
:
'
2021-02-12T12:06:17Z
'
,
id
:
123456
,
project_id
:
567890
,
web_url
:
'
https://example.com/foo/bar/pipelines/46
'
,
};
src/types.d.ts
浏览文件 @
7b6f1bab
...
...
@@ -59,5 +59,6 @@ interface RestPipeline {
status
:
'
running
'
|
'
pending
'
|
'
success
'
|
'
failed
'
|
'
canceled
'
|
'
skipped
'
;
updated_at
:
string
;
id
:
number
;
project_id
:
number
;
web_url
:
string
;
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录