floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

流水线创建修改

This commit is contained in:
victor 2021-01-27 16:27:56 +08:00
parent e1ddad5040
commit 2c648b7941
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/controllers/ci/pipelines_controller.rb
View File

@ -70,17 +70,20 @@ class Ci::PipelinesController < Ci::BaseController
# 在drone数据库repo表新增一条repo记录 # 在drone数据库repo表新增一条repo记录
def create_ci_repo(pipeline) def create_ci_repo(pipeline)
create_params = { if pipeline.branch != 'master'
repo_user_id: @ci_user.user_id, create_params = {
repo_namespace: @project.owner.login, repo_user_id: @ci_user.user_id,
repo_name: @project.identifier, repo_namespace: @project.owner.login,
repo_slug: "#{@project.owner.login}/#{@project.identifier}-" + pipeline.id.to_s, repo_name: @project.identifier,
repo_clone_url: @project.repository.url, repo_slug: "#{@project.owner.login}/#{@project.identifier}-" + pipeline.id.to_s,
repo_branch: pipeline.branch, repo_clone_url: @project.repository.url,
repo_config: pipeline.file_name repo_branch: pipeline.branch,
} repo_config: pipeline.file_name
repo = Ci::Repo.create_repo(create_params) }
repo repo = Ci::Repo.create_repo(create_params)
repo
end
nil
end end
def get_pipeline_file_sha(file_name, branch) def get_pipeline_file_sha(file_name, branch)
@ -88,9 +91,7 @@ class Ci::PipelinesController < Ci::BaseController
interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: branch || 'master') interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: branch || 'master')
if interactor.success? if interactor.success?
file = interactor.result file = interactor.result
return file['sha'] file['sha']
else
return nil
end end
end end