Publish/DevOps2/build-bash/19.get-app-version.bash

@@ -0,0 +1,47 @@
+set -e
+
+# export versionSuffix='.1234.preview'
+# bash 20.change-release-version.bash
+
+
+#---------------------------------------------------------------------
+#(x.1)参数
+args_="
+
+export versionSuffix='  '
+
+# "
+
+# remove spaces
+versionSuffix=${versionSuffix// /}
+
+#----------------------------------------------
+# curPath
+curPath=$PWD
+
+cd $curPath/../../..
+export basePath=$PWD
+cd $curPath
+
+
+
+#----------------------------------------------
+echo "#1 get version" 
+export version=`grep '<Version>' $(find ${basePath} -name *.csproj -exec grep '<pack>\|<publish>' -l {} \; | head -n 1) | grep -oE '\>(.*)\<' | tr -d '<>/'`
+echo "version from csproj: $version"
+
+# get v1 v2 v3
+v1=$(echo $version | tr '.' '\n' | sed -n 1p)
+v2=$(echo $version | tr '.' '\n' | sed -n 2p)
+v3=$(echo $version | tr '.-' '\n' | sed -n 3p)
+
+
+#export appVersion="${version%%-*}$versionSuffix"
+export appVersion="$v1.$v2.$v3$versionSuffix"
+echo "appVersion: $appVersion"
+
+
+
+#----------------------------------------------
+#9
+cd $curPath

Publish/DevOps2/jenkins-bash/library.develop.jenkinsfile

@@ -15,6 +15,7 @@ pipeline {
         versionSuffix = "-${stageName}${env.build_number}"
 
         basePath = "/root/docker-cache/jenkins/jenkins_home/workspace/${APPNAME}/${stageName}/${env.build_number}"
+        releasePath = "/root/docker-cache/jenkins/jenkins_home/jenkinsReleaseFile/${stageName}/${APPNAME}"
 
 
         SVN_PATH = "svn://svn.ki.lith.cloud/Sers"
@@ -89,6 +90,15 @@ pipeline {
             }
         }
 
+        stage('#3.3 build - copy release file') {
+            when { expression { env.inputChoice == 'yes' } }
+            steps {
+                script {
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export versionSuffix=$versionSuffix;    cd $codePath/Publish/DevOps2/build-bash; sh 20.change-app-version.bash;    echo \"\\cp -rf $codePath/Publish/release/release-zip/. $releasePath/$appVersion;\";  \\cp -rf $codePath/Publish/release/release-zip/. $releasePath/$appVersion;    '"
+                }
+            }
+        }
+
         stage('#4 publish') {
             when { expression { env.inputChoice == 'yes' } }
             steps {