Publish/DevOps/github/startup.bash

@@ -1,59 +0,0 @@
-set -e
-
-# cd /root/temp/svn/Publish/DevOps/github;bash startup.bash;
-
-#----------------------------------------------
-#(x.1)当前路径 
-curWorkDir=$PWD
-
-cd $curWorkDir/../../..
-export codePath=$PWD
-cd $curWorkDir
-
-
-# export codePath=/root/temp/svn
-export name=Sers
-
-#export DOCKER_USERNAME=serset
-#export DOCKER_PASSWORD=xxx
-
-#export NUGET_SERVER=https://api.nuget.org/v3/index.json
-#export NUGET_KEY=xxxxxxxxxx
-
-#export export GIT_SSH_SECRET=xxxxxx
-
-
-
-
-
-
-#----------------------------------------------
-echo "(x.2)get version" 
-export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${codePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
-# echo $version
-
-
-
-
-
-
-
-#----------------------------------------------
-echo "(x.3)自动发布 $name-$version"
-
-for file in *.sh
-do
-    echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-    echo bash $file
-    bash $file
-done
-
-
-
-
-
-
- 
-#----------------------------------------------
-#(x.9)
-#cd $curWorkDir

Publish/DevOps/k8s/00.svn-checkout.sh

@@ -1,31 +0,0 @@
-set -e
-
-# cd /home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers/code/Sers/dotnet/Doc/DevOps/k8s; bash 00.svn-checkout.sh
-
-
-#(x.1)当前路径
-curWorkDir=$PWD
-curPath=$(dirname $0)
-
-cd $curPath/../..
-basePath=$PWD
-# basePath=/home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers
-
-
-#(x.2)创建文件夹
-mkdir -p $basePath/code
-chmod 777 $basePath/code
-
-mkdir -p $basePath/nuget
-chmod 777 $basePath/nuget
-
-
-
-#(x.3)从svn拉取code
-# svnServer=svn://sers.cloud
-# svnUser=lith
-# svnPwd=pwd
-docker run -it --rm -v $basePath/code:/root/svn serset/svn-client svn checkout $svnServer /root/svn --username $svnUser --password $svnPwd --no-auth-cache
-
- 
-cd $curWorkDir

Publish/DevOps/k8s/01.svn-update.sh

@@ -1,33 +0,0 @@
-set -e
-
-# cd /home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers/code/Sers/dotnet/Doc/DevOps/k8s; bash 01.svn-update.sh
-
-
-
-
-#(x.1)当前路径
-curWorkDir=$PWD
-curPath=$(dirname $0)
-
-cd $curPath/../../../../..
-codePath=$PWD
-# codePath=/home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers/code
-
-#(x.2)cleanup
-docker run -i --rm -v $codePath:/root/svn serset/svn-client svn cleanup /root/svn --remove-unversioned
-
-
-#(x.3)revert
-docker run -i --rm -v $codePath:/root/svn serset/svn-client svn revert /root/svn -R
-
-
-
-
-#(x.4)拉取最新代码
-# svnUser=lith
-# svnPwd=pwd
-docker run -i --rm -v $codePath:/root/svn serset/svn-client svn update /root/svn --username $svnUser --password $svnPwd --no-auth-cache
-
-
-
-cd $curWorkDir

Publish/DevOps/k8s/10.code-changeVersion.sh

@@ -1,42 +0,0 @@
-set -e
-
-# cd /home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers/code/Sers/dotnet/Doc/DevOps/k8s; bash 10.changeVersion.sh
-
-
-#(x.1)当前路径
-curWorkDir=$PWD
-curPath=$(dirname $0)
-
-cd $curPath/../../../../..
-codePath=$PWD 
-# codePath=/home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers/code
-
-
-echo "(x.2)get oldVersion"
-#oldVersion=1.1.0.53
-oldVersion=`grep '<Version>' Sers/dotnet/Library/Vit/Vit.Core/Vit.Core/Vit.Core.csproj | grep -o '[0-9\.]\+'`
-
-vs=(${oldVersion//./ }) 
-
-
-
-echo "(x.3)get newVersion"
-v4=`docker run -i --rm -v $codePath:/root/svn serset/svn-client svn info \
-| grep 'Rev:' | awk -v RS='\r\n' '{print $4}'` 
- 
-newVersion=${vs[0]}.${vs[1]}.${vs[2]}.$v4 
-
- 
-
-
-echo "(x.4)modify csproj"
-echo "$oldVersion -> $newVersion"
-cd $codePath/Sers/dotnet
-sed -i "s/$oldVersion/$newVersion/g" `grep -a $oldVersion . -rl --include *.csproj`
-
-
-
-
-cd $curWorkDir
-
-

Publish/DevOps/k8s/20.nuget-publish-main.sh

@@ -1,33 +0,0 @@
-set -e
-
-# cd /home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers/code/Sers/dotnet/Doc/DevOps/k8s; bash 20.nuget-publish-main.sh
-
-
-#(x.1)当前路径
-curWorkDir=$PWD
-curPath=$(dirname $0)
-
-cd $curPath/../../../../../..
-basePath=$PWD
- 
-# basePath=/home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers
-
-
-echo "(x.2)构建dotnet项目并发布"
-
-docker run -i --rm \
---env LANG=C.UTF-8 \
--v $basePath/code:/root/code \
--v $basePath/nuget/packages:/root/.nuget/packages \
-serset/dotnet:6.0-sdk \
-bash /root/code/Sers/dotnet/Doc/DevOps/21.nuget-publish.sh 
-
-
-
-
-
-
-
-cd $curWorkDir
-
-

Publish/DevOps/k8s/21.nuget-publish.sh

@@ -1,19 +0,0 @@
-set -e
-
-
-
-codePath=/root/code/Sers/dotnet
-# codePath=/home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers/code/Sers/dotnet
-
-cd ${codePath}
-for file in $(grep -a '<TargetFramework>netstandard2.0</TargetFramework>' . -rl --include *.csproj)
-do
-    if ! [[ $file =~ (Apm|Empty|Temp|Zmq|SharedMemory|\-) ]]; then
-        echo pack $file
-	cd $codePath
-        cd $(dirname "$file")
-        dotnet build --configuration Release
-	dotnet pack --configuration Release --output '/root/code/Sers/dotnet/Doc/Publish/nuget'
-    fi
-done
-

Publish/DevOps/k8s/99.jenkins.sh

@@ -1,46 +0,0 @@
-set -e
-
-
-# cd /home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers/code/Sers/dotnet/Doc/DevOps/k8s; bash 99.jenkins.sh
-
-
-
-
-#路径
-codePath=/home/DataStore/HDD/Data/008.jenkins/data/PersistentVolume/workspace/Sers/code
-
-
-
-
-#(x.1)svn-update
-
-echo '(x.1.1)svn-cleanup'
-chroot /host bash -c "docker run -i --rm -v $codePath:/root/svn serset/svn-client svn cleanup /root/svn --remove-unversioned"
-
-echo '(x.1.2)svn-revert'
-chroot /host bash -c "docker run -i --rm -v $codePath:/root/svn serset/svn-client svn revert /root/svn -R"
-
-echo '(x.1.3)svn-update'
-# svnUser=lith
-# svnPwd=pwd
-chroot /host bash -c "docker run -i --rm -v $codePath:/root/svn serset/svn-client svn update /root/svn --username $svnUser --password $svnPwd --no-auth-cache"
-
-
- 
- 
-
- 
-
-
- 
-echo '(x.2)code-changeVersion'
-chroot /host bash -c "cd $codePath/Sers/dotnet/Doc/DevOps;bash 10.code-changeVersion.sh"
-
-
- 
- 
-echo '(x.3)nuget-publish'
-chroot /host bash -c "cd $codePath/Sers/dotnet/Doc/DevOps;bash 20.nuget-publish-main.sh"
-
-
- 

Publish/DevOps/github/45.sers压测-publish.sh → Publish/DevOps/release-bash/41.压测-copy.sh

@@ -5,19 +5,25 @@ set -e
 #(x.1)参数
 args_="
 
-export codePath=/root/temp/svn
+export basePath=/root/temp/svn
 
 # "
 
- 
+
+#---------------------------------------------------------------------
+#(x.2)
+publishPath=$basePath/Publish/release/release/压测
+
+
 
 
 echo ------------------------------------------------------------------
-echo '(x.2)发布Sers压测CL'
+echo '(x.3)发布CL压测'
 
 docker run -i --rm \
 --env LANG=C.UTF-8 \
--v $codePath:/root/code \
+-v $basePath:/root/code \
+-v $basePath/Publish/release/.nuget:/root/.nuget \
 serset/dotnet:6.0-sdk \
 bash -c "
 set -e
@@ -25,15 +31,15 @@ set -e
 echo 'publish Client'
 cd /root/code/dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmClient
 dotnet build --configuration Release
-dotnet publish --configuration Release --output /root/code/Publish/release/release/CL压测/CmClient
+dotnet publish --configuration Release --output /root/code/Publish/release/release/压测/CL压测netcoreapp2.1/CmClient
 
 echo 'publish Server'
 cd /root/code/dotnet/Library/Sers/Sers.CL/Test/CommunicationManage/CmServer
 dotnet build --configuration Release
-dotnet publish --configuration Release --output /root/code/Publish/release/release/CL压测/CmServer
+dotnet publish --configuration Release --output /root/code/Publish/release/release/压测/CL压测netcoreapp2.1/CmServer
 
 echo 'copy bat'
-\cp -rf /root/code/Publish/PublishFile/CL压测/. /root/code/Publish/release/release/CL压测
+\cp -rf /root/code/Publish/ReleaseFile/压测/CL压测/. /root/code/Publish/release/release/压测/CL压测netcoreapp2.1
 
 " 
 
@@ -41,17 +47,17 @@ echo 'copy bat'
 
 
 echo ------------------------------------------------------------------
-echo '(x.3)发布Sers压测'
+echo '(x.4)发布Sers压测'
 
 for netVersion in netcoreapp2.1 net6.0
 do
 
-	appPath=${codePath}/Publish/release/release/SersPublish/${netVersion}
+	appPath=${basePath}/Publish/release/release/Station\(${netVersion}\)
 
 	#---------------------------------------------- 
 	#单体压测
-	echo "(x.4)sers压测-publish单体压测${netVersion}"
-	targetPath=${codePath}/Publish/release/release/Sers压测/sers压测-单体压测${netVersion}
+	echo "(x.5)单体压测${netVersion}"
+	targetPath=${publishPath}/单体压测${netVersion}
 	mkdir -p $targetPath
 
 	echo "(x.x.1)copy ServiceCenter"
@@ -69,15 +75,15 @@ do
 	\cp -rf $appPath/Robot/App.Robot.Station.pdb $targetPath/ServiceCenter
 	\cp -rf $appPath/Robot/App.Robot.Station.xml $targetPath/ServiceCenter 
 
-	echo "(x.x.4)copy bat"
-	\cp -rf $codePath/Publish/PublishFile/Sers压测/单体压测/. $targetPath
+	echo "(x.x.4)copy ReleaseFile"
+	\cp -rf $basePath/Publish/ReleaseFile/压测/单体压测/. $targetPath
 
 
 
 	#---------------------------------------------- 
 	#分布式压测
-	echo "(x.5)sers压测-publish分布式压测${netVersion}"
-	targetPath=${codePath}/Publish/release/release/Sers压测/sers压测-分布式压测${netVersion}
+	echo "(x.6)分布式压测${netVersion}"
+	targetPath=${publishPath}/分布式压测${netVersion}
 	mkdir -p $targetPath
 
 	echo "(x.x.1)copy  station"
@@ -85,9 +91,8 @@ do
 	\cp -rf $appPath/Demo $targetPath
 	\cp -rf $appPath/Robot $targetPath
 
-	echo "(x.x.2)copy bat"
-	\cp -rf $codePath/Publish/PublishFile/Sers压测/分布式压测/. $targetPath
-
+	echo "(x.x.2)copy ReleaseFile"
+	\cp -rf $basePath/Publish/ReleaseFile/压测/分布式压测/. $targetPath
 
 done
 

Publish/DevOps/release-cmd/41.压测-copy.bat

@@ -10,6 +10,10 @@ set curPath=%cd%
 cd /d "%~dp0"
 cd /d ../../..
 set basePath=%cd%
+
+
+
+::(x.2)
 set publishPath=%basePath%/Publish/release/release/压测
 
 
@@ -17,8 +21,7 @@ set publishPath=%basePath%/Publish/release/release/压
 
 
 echo ------------------------------------------------------------------
-:: 发布CL压测
-echo 发布CL压测
+echo "(x.3)发布CL压测"
 
 ::Client
 cd /d "%basePath%\dotnet\Library\Sers\Sers.CL\Test\CommunicationManage\CmClient"
@@ -40,7 +43,7 @@ xcopy  "%basePath%\Publish\ReleaseFile\压
 
 
 echo ------------------------------------------------------------------
-:: 发布Sers压测
+::(x.4)发布Sers压测
 for %%i in (netcoreapp2.1,net6.0) do (  
 	set netVersion=%%i
 	set appPath=%basePath%/Publish/release/release/Station^(!netVersion!^)
@@ -78,7 +81,7 @@ for %%i in (netcoreapp2.1,net6.0) do (
 	xcopy "!appPath!\Demo" "!targetPath!\Demo" /e /i /r /y
 	xcopy "!appPath!\Robot" "!targetPath!\Robot" /e /i /r /y
 
-	::(x.x.2)copy bat
+	::(x.x.2)copy ReleaseFile
 	xcopy  "%basePath%\Publish\ReleaseFile\压测\分布式压测" "!targetPath!" /e /i /r /y
 )