Browse Source

fixed 参数不传时处理pipeline_name

pull/348/head
xxq250 1 year ago
parent
commit
b21317eb0a
1 changed files with 3 additions and 2 deletions
  1. +3
    -2
      app/controllers/api/v1/projects/pipelines_controller.rb

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

@@ -96,7 +96,8 @@ class Api::V1::Projects::PipelinesController < Api::V1::BaseController
@pipeline.file_name = ".gitea/workflows/#{@pipeline.pipeline_name}.yml"
@pipeline.branch = params[:branch] || @project.default_branch
@pipeline.json = params[:pipeline_json].to_json if params[:pipeline_json].present?
pipeline_yaml = params[:pipeline_yaml].present? ? params[:pipeline_yaml] : build_pipeline_yaml_new(params[:pipeline_name], params[:pipeline_json])
@pipeline.pipeline_name = params[:pipeline_name] if params[:pipeline_name].present?
pipeline_yaml = params[:pipeline_yaml].present? ? params[:pipeline_yaml] : build_pipeline_yaml_new(@pipeline.pipeline_name, params[:pipeline_json])
tip_exception("流水线yaml内空不能为空") if pipeline_yaml.blank?
@pipeline.yaml = pipeline_yaml
Rails.logger.info "pipeline_yaml base64=========================#{Base64.encode64(@pipeline.yaml).gsub(/\n/, '')}"
@@ -106,7 +107,7 @@ class Api::V1::Projects::PipelinesController < Api::V1::BaseController
file = interactor.result
@pipeline.pipeline_type = @pipeline.json.present? ? 2 : 1
@pipeline.save
render_ok({ pipeline_yaml: pipeline_yaml, pipeline_name: params[:pipeline_name], file_name: @pipeline.file_name, sha: sha.present? ? sha : file['content']['sha'] })
render_ok({ pipeline_yaml: pipeline_yaml, pipeline_name: @pipeline.pipeline_name, file_name: @pipeline.file_name, sha: sha.present? ? sha : file['content']['sha'] })
end

def build_yaml


Loading…
Cancel
Save