Browse Source

fixed 流水线重复生成

pull/348/head^2^2
xxq250 1 year ago
parent
commit
bddfe9d8f7
3 changed files with 4 additions and 4 deletions
  1. +1
    -2
      app/controllers/api/pm/pipelines_controller.rb
  2. +1
    -1
      app/controllers/api/v1/projects/pipelines_controller.rb
  3. +2
    -1
      app/views/api/pm/pipelines/index.json.jbuilder

+ 1
- 2
app/controllers/api/pm/pipelines_controller.rb View File

@@ -20,7 +20,7 @@ class Api::Pm::PipelinesController < Api::Pm::BaseController
project = Project.find_by(gpid: file_info.repo_id)
next if project.blank?
unless db_files.include?(".gitea/workflows/#{file}")
pipeline = Action::Pipeline.new(pipeline_name: file.to_s.gsub(".yml", "").gsub(".yaml", ""),
pipeline = Action::Pipeline.find_or_initialize_by(pipeline_name: file.to_s.gsub(".yml", "").gsub(".yaml", ""),
file_name: ".gitea/workflows/#{file}",
branch: project.default_branch,
is_graphic_design: false,
@@ -69,7 +69,6 @@ class Api::Pm::PipelinesController < Api::Pm::BaseController
@pipelines = Action::Pipeline.where(project_id: @project_ids).order(updated_at: :desc)
@pipelines = @pipelines.where("pipeline_name like ?", "%#{params[:pipeline_name]}%") if params[:pipeline_name].present?
@pipelines = @pipelines.where(pipeline_type: params[:pipeline_type]) if params[:pipeline_type].present?
@has_pipeline_ids = @pipelines.pluck(:project_id).uniq
@pipelines = @pipelines
@pipelines = paginate @pipelines
end


+ 1
- 1
app/controllers/api/v1/projects/pipelines_controller.rb View File

@@ -11,7 +11,7 @@ class Api::V1::Projects::PipelinesController < Api::V1::BaseController
@run_result = []
@files.map { |i| i['name'] }.each do |file|
unless db_files.include?(".gitea/workflows/#{file}")
pipeline = Action::Pipeline.new(pipeline_name: file.to_s.gsub(".yml", "").gsub(".yaml", ""),
pipeline = Action::Pipeline.find_or_initialize_by(pipeline_name: file.to_s.gsub(".yml", "").gsub(".yaml", ""),
file_name: ".gitea/workflows/#{file}",
branch: @project.default_branch,
is_graphic_design: false,


+ 2
- 1
app/views/api/pm/pipelines/index.json.jbuilder View File

@@ -1,6 +1,7 @@
json.status 0
json.message "success"
json.projects @has_pipeline_ids.each do |project_id|
json.count @pipelines.total_count
json.projects @pipelines.map(&:project_id).each do |project_id|
json.id project_id
project = Project.find_by(id: project_id)
if project.present?


Loading…
Cancel
Save