Trustie
/
forgeplus
forked from Gitlink/forgeplus
0
0
Fork 10
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增：流水线env参数

This commit is contained in:
yystopf 2025-10-20 11:29:14 +08:00
parent e97cc35f36
commit 9ae57e5692
4 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/api/v1/projects/pipelines_controller.rb
View File

@ -258,16 +258,22 @@ class Api::V1::Projects::PipelinesController < Api::V1::BaseController
node.node_id = input_node["id"] if input_node["id"].present?
run_values = {}
input_values = {}
env_input_values = {}
if input_node["data"]["inputs"].present?
input_node["data"]["inputs"].each do |input|
if input["name"].to_s.gsub("--", "") == "run"
run_values = run_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" })
else
input_values = input_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" })
if input["type"] == "Action::NodeInputs::Env"
env_input_values = env_input_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" })
else
input_values = input_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" })
end
end
end
node.run_values = run_values
node.input_values = input_values
node.env_input_values = env_input_values
end
steps_nodes.push(node)
end
@ -291,16 +297,22 @@ class Api::V1::Projects::PipelinesController < Api::V1::BaseController
node.node_id = input_node["id"] if input_node["id"].present?
run_values = {}
input_values = {}
env_input_values = {}
if input_node["data"]["inputs"].present?
input_node["data"]["inputs"].each do |input|
if input["name"].to_s.gsub("--", "") == "run"
run_values = run_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" })
else
input_values = input_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" })
if input["type"] == "Action::NodeInputs::Env"
env_input_values = env_input_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" })
else
input_values = input_values.merge({ "#{input["name"].gsub("--", "")}": "#{input["value"]}" })
end
end
end
node.run_values = run_values
node.input_values = input_values
node.env_input_values = env_input_values
end
node
end

2
app/models/action/node.rb
View File

@ -38,7 +38,7 @@ class Action::Node < ApplicationRecord
belongs_to :user, optional: true
attr_accessor :cust_name, :run_values, :input_values, :parent_node_id, :sub_nodes, :link_type_array, :node_id
attr_accessor :cust_name, :run_values, :input_values, :env_input_values, :parent_node_id, :sub_nodes, :link_type_array, :node_id
validates :name, presence: { message: "不能为空" }, uniqueness: true
validates :full_name, length: { maximum: 200, too_long: "不能超过200个字符" }

6
app/views/api/v1/projects/pipelines/_jobs.yaml.erb
View File

@ -13,6 +13,12 @@ jobs:
<% if node.name !="shell" %>
uses: <%=node.full_name %>
<% end %>
<%if node.env_input_values.present? %>
env:
<% node.env_input_values.each_key do |key| %>
<%=key %>: '<%=node.env_input_values[key] %>'
<%end %>
<%end %>
<%if node.input_values.present? %>
with:
<% node.input_values.each_key do |key| %>

6
app/views/api/v1/projects/pipelines/build_pipeline.yaml.erb
View File

@ -46,6 +46,12 @@ jobs:
<% if node.name !="shell" %>
uses: <%=node.full_name %>
<% end %>
<%if node.env_input_values.present? %>
env:
<% node.env_input_values.each_key do |key| %>
<%=key %>: '<%=node.env_input_values[key] %>'
<%end %>
<%end %>
<%if node.input_values.present? %>
with:
<% node.input_values.each_key do |key| %>