Commit dd451a94 by 李二毛

Merge branch 'development' into 'release/staging'

Development

See merge request liermao/microservice-autodevopspipelines!101
parents d80420c4 b7ae16b9
Pipeline #4328 passed with stages
in 57 seconds
...@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ...@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
devops\deploy.production.props = devops\deploy.production.props devops\deploy.production.props = devops\deploy.production.props
devops\deploy.props = devops\deploy.props devops\deploy.props = devops\deploy.props
devops\deploy.staging.props = devops\deploy.staging.props devops\deploy.staging.props = devops\deploy.staging.props
devops\token.props = devops\token.props
devops\version.props = devops\version.props devops\version.props = devops\version.props
EndProjectSection EndProjectSection
EndProject EndProject
......
...@@ -141,8 +141,9 @@ function IsPublishableOf() ...@@ -141,8 +141,9 @@ function IsPublishableOf()
# get updating's environment of branch # get updating's environment of branch
function RollEnvironmentOf() function RollEnvironmentOf()
{ {
FirstCharUpperCase ${CI_COMMIT_REF_NAME} branch declare branch=${CI_COMMIT_REF_NAME}
declare env=($(grep -oP "(?<=${branch}>)[^<]+" "./devops/branch.env.props")) declare name=($(grep -oP "(?<=${branch}>)[^<]+" "./devops/branch.env.props"))
FirstCharUpperCase ${name} env
eval $1="${env}" eval $1="${env}"
} }
......
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Replicas>1</Replicas> <Replicas>2</Replicas>
<ImageUserName>devopspipelines</ImageUserName> <ImageUserName>devopspipelines</ImageUserName>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
<Project>
<PropertyGroup>
<Kubernetes>
<AccessToken>
<Staging></Staging>
<Production></Production>
</AccessToken>
</Kubernetes>
</PropertyGroup>
</Project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment