auto commit 1.3.5

Publish/DevOps/github/90.release-file-copy.sh

@@ -0,0 +1,23 @@
+set -e
+
+
+#---------------------------------------------------------------------
+#(x.1)参数
+args_="
+
+export codePath=/root/temp/svn
+
+# "
+
+ 
+
+
+#----------------------------------------------
+echo "copy file"
+
+
+\cp -rf $codePath/Publish/ReleaseFile/docker-deploy $codePath/Publish/release/release/docker-deploy
+
+
+
+ 

Publish/DevOps/github/91.release-file-zip.sh

@@ -0,0 +1,28 @@
+set -e
+
+
+#---------------------------------------------------------------------
+#(x.1)参数
+args_="
+
+export codePath=/root/temp/svn
+
+export version=`grep '<Version>' $(grep '<pack/>\|<publish>' ${codePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
+
+export name=ServiceAdaptor
+
+# "
+
+ 
+
+
+
+#----------------------------------------------
+echo "压缩发布文件"
+
+docker run --rm -i \
+-v $codePath:/root/code \
+serset/filezip filezip zip -p -i /root/code/Publish/release/release -o /root/code/Publish/release/${name}-${version}.zip 
+
+
+

Publish/DevOps/github/90.release-build.sh → Publish/DevOps/github/95.release-push-to-serset-release.sh

@@ -15,29 +15,12 @@ export export GIT_SSH_SECRET=xxxxxx
 
 # "
 
- 
-
-
-
-#----------------------------------------------
-echo "(x.2)发布文件-压缩"
-
-
-\cp -rf $codePath/Publish/ReleaseFile/docker-deploy $codePath/Publish/release/release/docker-deploy
-
-
-docker run --rm -i \
--v $codePath:/root/code \
-serset/filezip filezip zip -p -i /root/code/Publish/release/release -o /root/code/Publish/release/${name}-${version}.zip 
-
-
-
 
 
 
 
 #----------------------------------------------
-echo "(x.3)github-提交release文件到release仓库"
+echo "github-提交release文件到serset/release仓库"
 # releaseFile=$codePath/Publish/release/${name}-${version}.zip
 
 #复制ssh key

Publish/DevOps/github/91.release-github.sh → Publish/DevOps/github/96.release-commit.sh

@@ -18,7 +18,7 @@ export name=ServiceAdaptor
 
 
 #---------------------------------------------------------------------
-#(x.2)初始化github release环境变量
+#(x.2)构建github release环境变量
 releaseFile=$codePath/Publish/release/${name}-${version}.zip
 
 filePath=${releaseFile}

Publish/cmd/90.release-file-copy.bat

@@ -0,0 +1,6 @@
+
+xcopy  "../ReleaseFile/docker-deploy" "../release/release/docker-deploy"  /e /i /r /y
+
+
+echo %~n0.bat Ö´Ðгɹ¦£¡
+

Publish/cmd/一键发布.bat

@@ -1,13 +1,15 @@
 
-call "nuget-pack.bat"
+echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
+call "30.nuget-pack.bat"
 
-call "dotnet-publish.bat"
-
-call "docker-image-create.bat"
-
-xcopy  "../ReleaseFile/docker-deploy" "../release/release/docker-deploy"  /e /i /r /y
+echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
+call "40.dotnet-publish.bat"
 
+echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
+call "70.docker-image-create.bat"
 
+echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%    
+call "90.release-file-copy"
 
 echo %~n0.bat Ö´ĐгɚŚŁĄ