Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PAC Backend #9908

Merged
merged 1,018 commits into from
Apr 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1018 commits
Select commit Hold shift + click to select a range
f1764bb
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 21, 2024
72aa62a
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Feb 21, 2024
a2543bf
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 22, 2024
9e4d500
feat:流水线版本管理机制 #8161 增加并发组名称检查
Feb 22, 2024
668fd3d
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 23, 2024
8196bd9
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Feb 23, 2024
e1e0cfa
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 23, 2024
8175f79
Merge remote-tracking branch 'github/master' into pac_github
mingshewhe Feb 26, 2024
2689e4e
Merge remote-tracking branch 'origin/pac_github' into pac_github
mingshewhe Feb 26, 2024
6701f1c
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 26, 2024
2b25de7
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 27, 2024
1539703
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 27, 2024
9f22bde
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 27, 2024
858b9c7
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 27, 2024
c3c048b
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Feb 27, 2024
f8dbf24
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 27, 2024
490f2ba
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 27, 2024
8dac968
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 27, 2024
4be3ca8
Merge remote-tracking branch 'github/master' into pac_github
mingshewhe Feb 28, 2024
804a28e
Merge branch 'pac_github' of origin into pac_github
mingshewhe Feb 28, 2024
17d7a75
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Feb 28, 2024
0a49c8c
Merge remote-tracking branch 'origin/pac_github' into pac_github
Feb 28, 2024
c10c0c5
feat:流水线版本管理机制 #8161 合并冲突
Feb 28, 2024
9197422
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Feb 28, 2024
268bf81
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 28, 2024
522ee54
Merge branch 'pac_github' of https://github.com/mingshewhe/bk-ci into…
mingshewhe Feb 28, 2024
d89cd48
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 28, 2024
dd5f134
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 28, 2024
f5c7a46
feat:流水线版本管理机制 #8161 增加数据兜底
Feb 28, 2024
34db738
Merge remote-tracking branch 'origin/pac_github' into pac_github
Feb 28, 2024
34b1eef
feat:流水线版本管理机制 #8161 增加数据兜底
Feb 28, 2024
24f79fa
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Feb 28, 2024
4d4bba7
feat:流水线版本管理机制 #8161 只有正式版本修改插件关联逻辑
Feb 29, 2024
6772ee2
feat:流水线版本管理机制 #8161 只有正式版本修改插件关联逻辑
Feb 29, 2024
17f96ba
feat:流水线版本管理机制 #8161 只有正式版本修改插件关联逻辑
Feb 29, 2024
6e628aa
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Feb 29, 2024
e6776ff
feat:流水线版本管理机制 #8161 修复保存若干问题
Feb 29, 2024
645850c
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Feb 29, 2024
54b456e
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Feb 29, 2024
d191f30
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Feb 29, 2024
f5b40db
feat:流水线版本管理机制 #8161 增加通知检查
Mar 1, 2024
85f27da
Merge remote-tracking branch 'origin/pac_github' into pac_github
Mar 1, 2024
1c24386
feat:流水线版本管理机制 #8161 合并主干
Mar 1, 2024
25d5cf0
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Mar 1, 2024
ab312d5
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 1, 2024
87ed0b4
Merge branch 'pac_github' of https://github.com/mingshewhe/bk-ci into…
mingshewhe Mar 1, 2024
acdf066
【PAC】feat:流水线常量 Code 语法和规范 #9971 顺道改改
yongyiduan Mar 1, 2024
7b02f39
Merge remote-tracking branch 'origin/pac_github' into pac_github
Mar 1, 2024
84889ca
【PAC】feat:流水线常量 Code 语法和规范 #9971 暂不支持模板
yongyiduan Mar 4, 2024
a3a50fa
feat:流水线版本管理机制 #8161 合并主干
Mar 4, 2024
eb4fdbb
Merge remote-tracking branch 'origin/pac_github' into pac_github
Mar 4, 2024
00b6d35
feat:流水线版本管理机制 #8161 取消非必填检查
Mar 4, 2024
e81964c
【PAC】feat:流水线常量 Code 语法和规范 #9971 增加校验
yongyiduan Mar 4, 2024
2dec069
feat:流水线版本管理机制 #8161 调试中生效调试版本的通知配置
Mar 4, 2024
671bf9a
Merge remote-tracking branch 'origin/pac_github' into pac_github
Mar 4, 2024
5fb5dac
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Mar 5, 2024
2cdcfb1
feat:流水线版本管理机制 #8161 增加通知校验
Mar 6, 2024
ae40257
feat:流水线版本管理机制 #8161 增加通知校验
Mar 6, 2024
5e65c06
feat:流水线版本管理机制 #8161 增加通知校验
Mar 7, 2024
458a7a1
feat:流水线版本管理机制 #8161 增加通知校验
Mar 8, 2024
d73fc15
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 8, 2024
0d3daed
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Mar 12, 2024
995533c
feat:流水线版本管理机制 #8161 增加版本号兜底
Mar 12, 2024
cdc67b1
Merge remote-tracking branch 'origin/pac_github' into pac_github
Mar 12, 2024
a746d3b
feat:流水线版本管理机制 #8161 增加版本号兜底
Mar 12, 2024
ad37d21
feat:流水线版本管理机制 #8161 修复版本列表查询
Mar 13, 2024
44157d2
feat:流水线版本管理机制 #8161 修复版本列表查询
Mar 13, 2024
f06089b
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Mar 13, 2024
c48884e
feat:流水线版本管理机制 #8161 修复版本列表查询
Mar 13, 2024
4e9c61e
feat:流水线版本管理机制 #8161 修复版本列表查询
Mar 13, 2024
155968a
feat:流水线版本管理机制 #8161 修复版本列表查询
Mar 13, 2024
83b3b04
feat:流水线版本管理机制 #8161 优化参数
Mar 13, 2024
6e9a5b7
feat:流水线版本管理机制 #8161 优化参数
Mar 13, 2024
0c8eebe
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 14, 2024
2b8bbc6
Merge branch 'pac_github' of https://github.com/mingshewhe/bk-ci into…
mingshewhe Mar 14, 2024
b77f50d
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Mar 14, 2024
7819991
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Mar 14, 2024
02b889c
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Mar 14, 2024
6a0be44
【PAC】feat:流水线常量 Code 语法和规范 #9971
yongyiduan Mar 14, 2024
8755738
feat:编辑变量交互优化 #9652
hejieehe Mar 15, 2024
490700e
feat:流水线版本管理机制 #8161 修复展示信息
Mar 15, 2024
c83f177
Merge remote-tracking branch 'origin/pac_github' into pac_github
Mar 15, 2024
826a262
feat:流水线版本管理机制 #8161 合并主干
Mar 15, 2024
81185f1
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Mar 15, 2024
b2895c0
Merge branch 'pac_github' of https://github.com/mingshewhe/bk-ci into…
hejieehe Mar 18, 2024
b2e34ea
feat:流水线版本管理机制 #8161 增加获取单个版本信息的接口
Mar 18, 2024
1771448
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Mar 18, 2024
ededebb
Merge remote-tracking branch 'github/master' into pac_github
Mar 18, 2024
790e460
feat:流水线版本管理机制 #8161 合并主干
yongyiduan Mar 18, 2024
830616d
feat:流水线版本管理机制 #8161 修复代码库同步逻辑
Mar 19, 2024
49922e3
Merge remote-tracking branch 'origin/pac_github' into pac_github
Mar 19, 2024
d913443
feat:编辑变量交互优化 #9652
hejieehe Mar 19, 2024
943ada1
feat:流水线版本管理机制 #8161 增加并发组名称检查
Feb 22, 2024
e1dda11
feat:流水线版本管理机制 #8161 合并主干
yongyiduan Mar 20, 2024
9f09835
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 20, 2024
919d8cc
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 20, 2024
ed3f59b
feat:编辑变量交互优化 #9652
hejieehe Mar 20, 2024
e1e0c5e
feat:编辑变量交互优化 #9652
hejieehe Mar 20, 2024
5874433
feat:编辑变量交互优化 #9652
hejieehe Mar 20, 2024
6f6dfee
feat:编辑变量交互优化 #9652
hejieehe Mar 20, 2024
421a523
Merge branch 'pac_github' of https://github.com/mingshewhe/bk-ci into…
hejieehe Mar 20, 2024
1bb1153
feat:流水线版本管理机制 #8161 调整websocket路径匹配
Mar 21, 2024
2a4a123
Merge remote-tracking branch 'origin/pac_github' into pac_github
Mar 21, 2024
24f0169
feat:流水线版本管理机制 #8161 增加拦截和通知传参
Mar 21, 2024
30039de
feat:流水线版本管理机制 #8161 表达式替换忽略空值
Mar 21, 2024
2160ada
feat:流水线版本管理机制 #8161 表达式替换忽略空值
Mar 21, 2024
122eb18
feat:编辑变量交互优化 #9652 输出结果增加排序
hejieehe Mar 26, 2024
b805671
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 27, 2024
ce3e7c5
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 27, 2024
e00069e
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 28, 2024
3c87e4c
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 28, 2024
e7d5064
feat:流水线版本管理机制 #8161 增加新建流水线指定配置
Mar 28, 2024
6c6c8f9
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Mar 28, 2024
5a83f68
feat:流水线版本管理机制 #8161 合并主干
Mar 28, 2024
756d9d3
feat:流水线版本管理机制 #8161 修复流水线配置传参
Mar 28, 2024
3700e6e
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 28, 2024
285c9c7
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 28, 2024
40481bd
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 28, 2024
95aff3b
feat:流水线版本管理机制 #8161 优化仅分支版本的判断
Mar 28, 2024
1f74930
feat:流水线版本管理机制 #8161 合并主干
yongyiduan Mar 28, 2024
cddced1
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 28, 2024
8ca5d5e
feat:流水线版本管理机制 #8161 增加导入的传参
Mar 29, 2024
4e72da5
Merge remote-tracking branch 'origin/pac_github' into pac_github
Mar 29, 2024
a799d9d
feat:流水线版本管理机制 #8161 增加导入的传参
Mar 29, 2024
a7fe36b
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 29, 2024
69e8ca2
feat:流水线版本管理机制 #8161 增加版本兜底
Mar 29, 2024
c3e34c0
feat:流水线版本管理机制 #8161 增加版本兜底
Mar 29, 2024
95f8077
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Mar 29, 2024
550250c
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 29, 2024
b2cca1a
Merge branch 'pac_github' of https://github.com/mingshewhe/bk-ci into…
mingshewhe Mar 29, 2024
63c45ec
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Mar 29, 2024
7f78012
feat:流水线版本管理机制 #8161 增加版本兜底
Mar 29, 2024
420d048
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
a12d4ac
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
d19f24d
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
4d1a769
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
4997db4
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
9ac6151
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
ec1cab1
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
5cd2bb1
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
e7fc52e
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
bf3c042
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
f2903c2
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
5413298
feat:流水线版本管理机制 #8161 修改流水线状态
Apr 1, 2024
5c1eb20
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 1, 2024
bfe6b1a
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 2, 2024
61f71ca
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 2, 2024
d80f699
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Apr 2, 2024
7ed1d71
feat:流水线版本管理机制 #8161 配置初始化修复
Apr 2, 2024
66155f2
feat:流水线版本管理机制 #8161 配置初始化修复
Apr 2, 2024
220ab79
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 2, 2024
d5bad0c
Merge branch 'pac_github' of https://github.com/mingshewhe/bk-ci into…
mingshewhe Apr 2, 2024
19d8f58
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 2, 2024
570e210
feat:流水线版本管理机制 #8161 优化国际化
Apr 3, 2024
0593e79
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Apr 3, 2024
da88f12
feat:流水线版本管理机制 #8161 优化错误码
Apr 7, 2024
eb1f760
feat:流水线版本管理机制 #8161 优化版本预览
Apr 7, 2024
789961c
feat:流水线版本管理机制 #8161 优化版本预览
Apr 8, 2024
a6d74b2
bugfix: 人工审核未勾选通知方式不应进行通知 #10183
yongyiduan Apr 8, 2024
2f9c6ce
feat:流水线版本管理机制 #8161 优化stage检查
Apr 9, 2024
1630c4f
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 9, 2024
03930c8
feat:流水线版本管理机制 #8161 合并主干
Apr 9, 2024
ef57b0c
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 9, 2024
36b6328
feat:流水线版本管理机制 #8161 合并主干
yongyiduan Apr 9, 2024
8e7cf6d
Merge branch 'pac_github' of https://github.com/mingshewhe/bk-ci into…
mingshewhe Apr 9, 2024
3c2ce5e
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 9, 2024
9c3fe19
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 9, 2024
92db729
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 9, 2024
53b6779
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 11, 2024
fa7339e
feat:流水线版本管理机制 #8161 增加接口参数
Apr 11, 2024
e9101ce
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 11, 2024
a8fdd54
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 11, 2024
036c3fb
feat:流水线版本管理机制 #8161 优化保存逻辑
Apr 11, 2024
0fc2ba0
feat:流水线版本管理机制 #8161 增加配置
Apr 12, 2024
cc9f5b9
【PAC】feat:自定义构建号格式支持 Code 方式定义 #10210
yongyiduan Apr 12, 2024
ec6a7e7
feat:流水线版本管理机制 #8161 增加配置
Apr 15, 2024
3c0abb2
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 15, 2024
d1aa4dc
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 15, 2024
e4581f1
feat:流水线版本管理机制 #8161 增加配置
Apr 15, 2024
aa19735
【PAC】feat:自定义构建号格式支持 Code 方式定义 #10210
yongyiduan Apr 15, 2024
3e7a62c
feat:流水线版本管理机制 #8161 修复版本计算
Apr 15, 2024
8696ab7
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 15, 2024
0433159
feat:【PAC】跨项目复用构建资源池,支持Code配置 #10225
yongyiduan Apr 15, 2024
4d593fc
feat:【PAC】跨项目复用构建资源池,支持Code配置 #10225
yongyiduan Apr 15, 2024
290896e
feat:【PAC】跨项目复用构建资源池,支持Code配置 #10225
yongyiduan Apr 15, 2024
2548c14
feat:流水线版本管理机制 #8161 优化调试构建的清理
Apr 16, 2024
5456c57
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 16, 2024
b720ff3
feat:流水线版本管理机制 #8161 优化调试构建的清理
Apr 16, 2024
d401af2
feat:【PAC】跨项目复用构建资源池,支持Code配置 #10225
yongyiduan Apr 16, 2024
2ce4a34
feat:【PAC】跨项目复用构建资源池,支持Code配置 #10225
yongyiduan Apr 16, 2024
38aecce
feat:流水线版本管理机制 #8161 过滤草稿条件优化
Apr 19, 2024
01f3680
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 19, 2024
b07b40d
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Apr 19, 2024
f66c76f
feat:流水线版本管理机制 #8161 过滤草稿条件优化
Apr 19, 2024
da00133
feat:流水线版本管理机制 #8161 过滤草稿条件优化
Apr 19, 2024
99566b2
feat:流水线版本管理机制 #8161 过滤草稿条件优化
Apr 19, 2024
ce0af94
feat:流水线版本管理机制 #8161 过滤草稿条件优化
Apr 19, 2024
024cfb5
feat:流水线版本管理机制 #8161 优化参数
Apr 19, 2024
5b92bc8
feat:流水线版本管理机制 #8161 优化参数
Apr 19, 2024
ce72b73
feat:流水线版本管理机制 #8161 优化参数
Apr 19, 2024
dc68f8d
feat:流水线版本管理机制 #8161 增加YAML版本标识处理
Apr 22, 2024
c354917
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 22, 2024
f9fa42c
feat:流水线版本管理机制 #8161 增加YAML版本标识处理
Apr 22, 2024
c85bbab
feat:流水线版本管理机制 #8161 优化参数
yongyiduan Apr 22, 2024
d8a288d
feat:流水线版本管理机制 #8161 增加YAML版本标识处理
Apr 22, 2024
1a70afd
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 22, 2024
bdf7e45
feat:流水线版本管理机制 #8161 增加YAML版本标识处理
yongyiduan Apr 22, 2024
71ec3ff
feat:流水线版本管理机制 #8161 增加YAML版本标识处理
yongyiduan Apr 22, 2024
735755a
feat:流水线版本管理机制 #8161 增加YAML版本标识处理
Apr 22, 2024
530ec62
feat:流水线版本管理机制 #8161 增加YAML版本标识处理
Apr 22, 2024
f106a7e
feat:流水线版本管理机制 #8161 增加YAML版本标识处理
Apr 22, 2024
2867672
feat:流水线版本管理机制 #8161 增加YAML版本标识处理
Apr 22, 2024
1579e57
feat:流水线版本管理机制 #8161 优化if,限制v2
yongyiduan Apr 22, 2024
11850a4
feat:流水线版本管理机制 #8161 增加YAML版本标识处理
Apr 22, 2024
fcc4057
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 22, 2024
06d2651
feat:流水线版本管理机制 #8161 优化参数
yongyiduan Apr 23, 2024
406459e
Merge remote-tracking branch 'github/master' into pac_github
mingshewhe Apr 23, 2024
595f042
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 23, 2024
00903f7
feat:流水线版本管理机制 #8161 修复草稿字段
Apr 24, 2024
1bccd89
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Apr 24, 2024
b2dd80c
feat:流水线版本管理机制 #8161 补充sql字段
Apr 24, 2024
2d95978
feat:流水线版本管理机制 #8161 补充sql字段
Apr 24, 2024
ed70720
feat:流水线版本管理机制 #8161 优化坐标
yongyiduan Apr 24, 2024
22dc398
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 24, 2024
aa582f0
feat:流水线版本管理机制 #8161 补充sql字段
Apr 24, 2024
57a1eb0
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Apr 24, 2024
4fbd3d5
feat:流水线版本管理机制 #8161 补充sql字段
Apr 24, 2024
0411e2a
feat:流水线版本管理机制 #8161 补充sql字段
Apr 24, 2024
28fa873
feat:流水线版本管理机制 #8161 补充sql字段
Apr 24, 2024
c76ba64
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 24, 2024
f01d827
feat:流水线版本管理机制 #8161 优化代码
yongyiduan Apr 25, 2024
f5b924f
Merge branch 'pac_github' of https://git.woa.com/bkdevops/bk-ci into …
yongyiduan Apr 25, 2024
2384984
feat:流水线版本管理机制 #8161 补充sql字段
Apr 25, 2024
3614624
feat:流水线版本管理机制 #8161 补充sql字段
Apr 25, 2024
1a84512
Merge remote-tracking branch 'origin/pac_github' into pac_github
Apr 25, 2024
b736d11
feat:流水线版本管理机制 #8161 补充sql字段
Apr 25, 2024
5812900
feat:流水线版本管理机制 #8161 补充sql字段
Apr 25, 2024
6d63637
feat:流水线版本管理机制 #8161 补充sql字段
Apr 25, 2024
3d87c42
Merge remote-tracking branch 'github/master' into pac_github
mingshewhe Apr 25, 2024
328a4f0
Merge branch 'pac_github' of https://github.com/mingshewhe/bk-ci into…
mingshewhe Apr 26, 2024
098acfc
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 26, 2024
7548e61
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 26, 2024
2f0e113
feat:流水线版本管理机制 #8161 修改id
Apr 26, 2024
a1955a8
Merge remote-tracking branch 'mingshewhe/pac_github' into pac_github
Apr 26, 2024
c637e5d
feat:流水线版本管理机制 #8161 修改id
Apr 26, 2024
2bec350
【PAC】feat:开启PAC模式的代码库支持自动同步代码库YAML变更到蓝盾 #8130
mingshewhe Apr 26, 2024
d3d7629
feat:流水线版本管理机制 #8161 修改id
Apr 26, 2024
939a6d4
feat:流水线版本管理机制 #8161 修改id
Apr 26, 2024
2ef2b27
feat:流水线版本管理机制 #8161 修改id
Apr 26, 2024
f66dda5
feat:流水线版本管理机制 #8161 修改id
Apr 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ object Versions {
const val JsonSchema = "2.2.6"
const val Jasypt = "3.0.3"
const val Swagger = "1.6.2"
const val orgJson = "20210307"
const val orgJson = "20230618"
const val JsonLib = "2.4"
const val CronUtils = "9.1.6"
const val Thumbnailator = "0.4.8"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,13 @@ object CommonMessageCode {
const val ERROR_INTERFACE_RETRY_NUM_EXCEEDED = "2100123" // 接口连续重试次数超过{0}次,请稍后再试
const val ERROR_PIPELINE_API_ACCESS_NO_PERMISSION = "2100124" // 流水线[{0}]没有接口[{1}]的访问权限
const val TEMPLATE_PLUGIN_NOT_ALLOWED_USE = "2100125" // 模板中插件【{0}】的【{1}】版本的状态是【{2}】,不允许使用
const val ADD_MR_FAIL = "2100126" // 添加MR失败

// 互转使用
const val ELEMENT_UPDATE_WRONG_PATH = "2100127" // 更新插件的标注位置有误
const val ELEMENT_NOT_SUPPORT_TRANSFER = "2100128" // 如下插件在 Code 方式下已不支持,请修改后再切换: \n[{0}]
const val DISPATCH_NOT_SUPPORT_TRANSFER = "2100129" // 如下构建环境在 Code 方式下不支持转换,请修改后再切换: \n[{0}]
const val YAML_NOT_VALID = "2100130" // yaml不合法 {0}
const val GIT_INVALID_PRIVATE_KEY = "2100131" // 不支持的SSH私钥格式,仅支持rsa格式私钥
const val GIT_INVALID_PRIVATE_KEY_OR_PASSWORD = "2100132" // 第三方服务[{0}]操作失败,失败详情:{1}

Expand Down Expand Up @@ -235,6 +242,8 @@ object CommonMessageCode {
const val OPERATION_LIST_WEBHOOK = "bkOperationListWebhook" // 查询WEBHOOK
const val OPERATION_ADD_COMMIT_CHECK = "bkOperationAddCommitCheck" // 添加COMMIT CHECK
const val OPERATION_ADD_MR_COMMENT = "bkOperationAddMrComment" // 添加MR COMMENT
const val OPERATION_LIST_MR = "bkOperationListMr" // 添加MR
const val OPERATION_ADD_MR = "bkOperationAddMr" // 添加MR
const val OPERATION_COMMIT = "bkOperationCommit" // 拉提交记录
const val OPERATION_COMMIT_DIFF = "bkOperationCommitDiff" // 查询commit变化
const val OPERATION_UNLOCK_HOOK_LOCK = "bkOperationUnlockHookLock" // 解锁hook锁
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
* Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available.
*
* Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
*
* BK-CI 蓝鲸持续集成平台 is licensed under the MIT license.
*
* A copy of the MIT License is included in this file.
*
*
* Terms of the MIT License:
* ---------------------------------------------------
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of
* the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
* LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
* NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

package com.tencent.devops.common.api.enums

/**
* 代码库拉取代码库类型
*/
enum class CheckoutRepositoryType {
ID,
NAME,
URL,
SELF
;

companion object {
fun parseType(type: String?): CheckoutRepositoryType {
if (type.isNullOrBlank()) return ID
return valueOf(type)
}

/**
* 拉取类型跳过定时触发源代码变更检查
*/
fun skipTimerTriggerChange(type: String?): Boolean {
return when (type) {
URL.name, SELF.name -> true
else -> false
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ package com.tencent.devops.common.api.enums
import com.fasterxml.jackson.annotation.JsonIgnore
import com.tencent.devops.common.api.exception.ParamBlankException
import io.swagger.v3.oas.annotations.media.Schema

import java.net.URLEncoder

/**
Expand All @@ -43,6 +44,25 @@ class RepositoryConfig(
@get:Schema(title = "新版的git插件的类型")
val repositoryType: RepositoryType
) {

constructor(
repositoryHashId: String?,
repositoryName: String?,
triggerRepositoryType: TriggerRepositoryType?,
selfRepoHashId: String?
) : this(
repositoryHashId =
if (triggerRepositoryType == TriggerRepositoryType.SELF) {
selfRepoHashId
} else {
repositoryHashId
},
repositoryName = repositoryName,
repositoryType = TriggerRepositoryType.toRepositoryType(
triggerRepositoryType
) ?: RepositoryType.ID
)

@JsonIgnore
fun getRepositoryId(): String {
return when (repositoryType) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

package com.tencent.devops.common.api.enums

enum class ScmType {
CODE_SVN,
CODE_GIT,
CODE_GITLAB,
GITHUB,
CODE_TGIT,
CODE_P4
enum class ScmType(val alis: String) {
CODE_SVN("svn"),
CODE_GIT("git"),
CODE_GITLAB("gitlab"),
GITHUB("github"),
CODE_TGIT("tgit"),
CODE_P4("p4")
;

companion object {
Expand All @@ -47,5 +47,13 @@ enum class ScmType {
CODE_P4 -> 6.toShort()
}
}

fun parse(alis: String?): ScmType? {
if (alis.isNullOrBlank()) return null
values().forEach {
if (alis == it.alis) return it
}
return null
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,18 @@

package com.tencent.devops.common.api.enums

enum class RepositoryTypeNew {
enum class TriggerRepositoryType {
ID,
NAME,
URL
;
SELF;

companion object {
fun parseType(type: String?): RepositoryTypeNew {
if (type.isNullOrBlank()) return ID
return valueOf(type)
fun toRepositoryType(type: TriggerRepositoryType?): RepositoryType? {
return when (type) {
ID, SELF -> RepositoryType.ID
NAME -> RepositoryType.NAME
else -> null
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data class I18Variable(
@get:Schema(title = "国际化变量名")
val code: String,
@get:Schema(title = "国际化参数")
val params: List<String>,
val params: List<String>? = emptyList(),
@get:Schema(title = "默认信息")
val defaultMessage: String? = null
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,4 +320,16 @@ object MQ {

// 数据库分片
const val EXCHANGE_SHARDING_ROUTING_RULE_FANOUT = "e.sharding.routing.rule.exchange.fanout"

// pac每条流水线触发事件
const val EXCHANGE_PIPELINE_YAML_LISTENER = "e.pipeline.yaml.listener"
// pac开启流水线事件
const val ROUTE_PIPELINE_YAML_ENABLE_EVENT = "r.pipeline.yaml.enable.event"
const val QUEUE_PIPELINE_YAML_ENABLE_EVENT = "q.pipeline.yaml.enable.event"
// pac触发事件
const val ROUTE_PIPELINE_YAML_TRIGGER_EVENT = "r.pipeline.yaml.trigger.event"
const val QUEUE_PIPELINE_YAML_TRIGGER_EVENT = "q.pipeline.yaml.trigger.event"
// pac关闭流水线事件
const val ROUTE_PIPELINE_YAML_DISABLE_EVENT = "r.pipeline.yaml.disable.event"
const val QUEUE_PIPELINE_YAML_DISABLE_EVENT = "q.pipeline.yaml.disable.event"
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ enum class NotifyType {
*/
companion object {
fun opEditable(): List<NotifyType> {
return listOf(EMAIL, RTX, WECHAT)
return listOf(EMAIL, RTX, WECHAT, WEWORK_GROUP)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import com.tencent.devops.common.notify.enums.NotifyType

object NotifyUtils {
const val WEWORK_GROUP_KEY = "__WEWORK_GROUP__"
fun checkNotifyType(notifyType: MutableList<String>?): MutableSet<String>? {
fun checkNotifyType(notifyType: MutableList<String>?): MutableSet<String> {
if (notifyType != null) {
val allTypeSet = NotifyType.values().map { it.name }.toMutableSet()
allTypeSet.remove(NotifyType.SMS.name)
return (notifyType.toSet() intersect allTypeSet).toMutableSet()
}
return notifyType
return mutableSetOf()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,20 @@ dependencies {
api(project(":core:common:common-webhook:biz-common-webhook"))
api(project(":core:common:common-expression"))
api(project(":core:store:api-store"))
api(project(":core:auth:api-auth"))
api(project(":core:quality:api-quality"))
api(project(":core:dispatch:api-dispatch-docker"))

api("org.apache.ant:ant")
api("org.apache.commons:commons-text")
api("org.yaml:snakeyaml")
api("com.github.fge:json-schema-validator")
// https://mvnrepository.com/artifact/io.github.java-diff-utils/java-diff-utils
implementation("io.github.java-diff-utils:java-diff-utils:4.12")
// https://mvnrepository.com/artifact/org.json/json
implementation("org.json:json:20230618")
// https://mvnrepository.com/artifact/org.yaml/snakeyaml
// implementation("org.yaml:snakeyaml:2.1")
testImplementation(project(":core:common:common-test"))
}

plugins {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

package com.tencent.devops.process.yaml.modelCreate
package com.tencent.devops.process.yaml.creator

import com.tencent.devops.common.client.Client
import com.tencent.devops.common.pipeline.enums.ChannelCode
Expand All @@ -42,8 +42,10 @@ object ModelCommon {
return when {
ref.startsWith("refs/heads/") ->
ref.removePrefix("refs/heads/")

ref.startsWith("refs/tags/") ->
ref.removePrefix("refs/tags/")

else -> ref
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

package com.tencent.devops.process.yaml.modelCreate
package com.tencent.devops.process.yaml.creator

import com.fasterxml.jackson.databind.ObjectMapper
import com.tencent.devops.common.api.constant.CommonMessageCode.BK_ENV_NOT_YET_SUPPORTED
Expand All @@ -47,14 +47,15 @@ import com.tencent.devops.common.pipeline.option.MatrixControlOption
import com.tencent.devops.common.pipeline.pojo.element.Element
import com.tencent.devops.common.web.utils.I18nUtil
import com.tencent.devops.process.pojo.BuildTemplateAcrossInfo
import com.tencent.devops.process.yaml.modelCreate.inner.InnerModelCreator
import com.tencent.devops.process.yaml.creator.inner.InnerModelCreator
import com.tencent.devops.process.yaml.transfer.TransferCacheService
import com.tencent.devops.process.yaml.pojo.StreamDispatchInfo
import com.tencent.devops.process.yaml.utils.ModelCreateUtil
import com.tencent.devops.process.yaml.utils.StreamDispatchUtils
import com.tencent.devops.process.yaml.v2.models.IfType
import com.tencent.devops.process.yaml.v2.models.Resources
import com.tencent.devops.process.yaml.v2.models.job.Job
import com.tencent.devops.process.yaml.v2.models.job.Mutex
import com.tencent.devops.process.yaml.v2.utils.StreamDispatchUtils
import com.tencent.devops.store.api.container.ServiceContainerAppResource
import javax.ws.rs.core.Response
import org.springframework.beans.factory.annotation.Autowired
Expand All @@ -65,7 +66,8 @@ class ModelContainer @Autowired(required = false) constructor(
val client: Client,
val objectMapper: ObjectMapper,
@Autowired(required = false)
val inner: InnerModelCreator?
val inner: InnerModelCreator?,
val transferCache: TransferCacheService
) {

fun addVmBuildContainer(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

package com.tencent.devops.process.yaml.modelCreate
package com.tencent.devops.process.yaml.creator

import com.tencent.devops.common.api.constant.CommonMessageCode.BK_BUILD_TRIGGER
import com.tencent.devops.common.api.constant.CommonMessageCode.BK_MANUAL_TRIGGER
Expand All @@ -43,10 +43,10 @@ import com.tencent.devops.process.engine.common.VMUtils
import com.tencent.devops.process.pojo.classify.PipelineGroup
import com.tencent.devops.process.pojo.classify.PipelineGroupCreate
import com.tencent.devops.process.pojo.classify.PipelineLabelCreate
import com.tencent.devops.process.pojo.setting.PipelineModelAndSetting
import com.tencent.devops.process.pojo.setting.PipelineRunLockType
import com.tencent.devops.process.pojo.setting.PipelineSetting
import com.tencent.devops.process.yaml.modelCreate.inner.ModelCreateEvent
import com.tencent.devops.common.pipeline.pojo.PipelineModelAndSetting
import com.tencent.devops.common.pipeline.pojo.setting.PipelineRunLockType
import com.tencent.devops.common.pipeline.pojo.setting.PipelineSetting
import com.tencent.devops.process.yaml.creator.inner.ModelCreateEvent
import com.tencent.devops.process.yaml.pojo.QualityElementInfo
import com.tencent.devops.process.yaml.v2.models.ScriptBuildYaml
import java.util.concurrent.TimeUnit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

package com.tencent.devops.process.yaml.modelCreate
package com.tencent.devops.process.yaml.creator

/**
* ModelCreate产生的异常都应该收归到这里
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

package com.tencent.devops.process.yaml.modelCreate
package com.tencent.devops.process.yaml.creator

import com.tencent.devops.common.client.Client
import com.tencent.devops.common.pipeline.NameAndValue
Expand All @@ -36,8 +36,8 @@ import com.tencent.devops.common.pipeline.pojo.element.RunCondition
import com.tencent.devops.common.pipeline.pojo.element.agent.LinuxScriptElement
import com.tencent.devops.common.pipeline.pojo.element.agent.WindowsScriptElement
import com.tencent.devops.common.pipeline.pojo.element.market.MarketBuildAtomElement
import com.tencent.devops.process.yaml.modelCreate.inner.InnerModelCreator
import com.tencent.devops.process.yaml.modelCreate.inner.ModelCreateEvent
import com.tencent.devops.process.yaml.creator.inner.InnerModelCreator
import com.tencent.devops.process.yaml.creator.inner.ModelCreateEvent
import com.tencent.devops.process.yaml.utils.ModelCreateUtil
import com.tencent.devops.process.yaml.utils.PathMatchUtils
import com.tencent.devops.process.yaml.v2.models.IfType
Expand Down Expand Up @@ -170,7 +170,7 @@ class ModelElement @Autowired(required = false) constructor(
if (job.runsOn.agentSelector.isNullOrEmpty()) {
linux
} else {
when (job.runsOn.agentSelector.first()) {
when (job.runsOn.agentSelector!!.first()) {
"linux" -> linux
"macos" -> linux
"windows" -> WindowsScriptElement(
Expand Down
Loading
Loading