.github/workflows/action-main.yml

@@ -32,6 +32,7 @@ jobs:
         run: |
            set -e
            echo start build
+           export APPNAME="Sers"
            export DOCKER_USERNAME="${{ secrets.DOCKER_USERNAME  }}"
            export DOCKER_PASSWORD="${{ secrets.DOCKER_PASSWORD }}"
            export NUGET_SERVER="${{ secrets.NUGET_SERVER  }}"

Publish/DevOps/github-bash/75.github-push-to-serset-release.sh

@@ -9,9 +9,9 @@ export basePath=/root/temp/svn
 
 export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
-export name=ServiceAdaptor
+export APPNAME=xxxxxx
 
-export export GIT_SSH_SECRET=xxxxxx
+export GIT_SSH_SECRET=xxxxxx
 
 # "
 
@@ -39,9 +39,9 @@ git config --global user.name 'lith'
 mkdir -p /root/code
 cd /root/code
 git clone git@github.com:serset/release.git /root/code
-mkdir -p /root/code/file/${name}/${name}-${version}
-\\cp -rf  /root/release/release-zip/. /root/code/file/${name}/${name}-${version}
-git add /root/code/file/${name}/${name}-${version}/.
+mkdir -p /root/code/file/${APPNAME}/${APPNAME}-${version}
+\\cp -rf  /root/release/release-zip/. /root/code/file/${APPNAME}/${APPNAME}-${version}
+git add /root/code/file/${APPNAME}/${APPNAME}-${version}/.
 git commit -m 'auto commit ${version}'
 git push -u origin master \" "
 

Publish/DevOps/github-bash/76.github-push-release.sh

@@ -9,7 +9,7 @@ export basePath=/root/temp/svn
 
 export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
-export name=ServiceAdaptor
+export APPNAME=xxxxxx
 
 # "
 
@@ -23,7 +23,7 @@ export name=ServiceAdaptor
 
 
 
-echo "release_name=${name}-${version}" >> $GITHUB_ENV
+echo "release_name=${APPNAME}-${version}" >> $GITHUB_ENV
 echo "release_tag=${version}" >> $GITHUB_ENV
 
 echo "release_draft=false" >> $GITHUB_ENV
@@ -38,7 +38,7 @@ echo "release_version=${version}" >> $GITHUB_ENV
 #filePath=$basePath/Publish/release/release-zip/Sers-ServiceCenter(net5.0)-${version}.zip
 #fileType="${filePath##*.}"
 #echo "release_assetPath=${filePath}" >> $GITHUB_ENV
-#echo "release_assetName=${name}-${version}.${fileType}" >> $GITHUB_ENV
+#echo "release_assetName=${APPNAME}-${version}.${fileType}" >> $GITHUB_ENV
 #echo "release_contentType=application/zip" >> $GITHUB_ENV
 
 

Publish/DevOps/github-bash/startup.bash

@@ -6,18 +6,18 @@ set -e
 #(x.1)参数
 args_="
 
+export APPNAME=xxxxxx
+
 export DOCKER_USERNAME=serset
 export DOCKER_PASSWORD=xxxxxx
 
 export NUGET_SERVER=https://api.nuget.org/v3/index.json
 export NUGET_KEY=xxxxxx
 
-export export GIT_SSH_SECRET=xxxxxx
+export GIT_SSH_SECRET=xxxxxx
 
 # "
 
-export name=Sers
-
 #----------------------------------------------
 #(x.2)当前路径
 curPath=$PWD

Publish/DevOps/jenkins-bash/release.jenkins.pipeline

@@ -3,6 +3,7 @@ pipeline {
 
     environment {
         basePath = "/root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code"
+        APPNAME = "Sers"
         SVN_USERNAME = "jenkins"
         SVN_PASSWORD = "xxxxxx"
         DOCKER_USERNAME = "serset"
@@ -25,21 +26,21 @@ pipeline {
         stage('(x.1)svn-update') { 
             agent any 
             steps {
-                sh "chroot /host bash -c 'set -e; export SVN_USERNAME=$SVN_USERNAME;export SVN_PASSWORD=$SVN_PASSWORD;export DOCKER_USERNAME=$DOCKER_USERNAME;export DOCKER_PASSWORD=$DOCKER_PASSWORD;export NUGET_KEY=$NUGET_KEY;export NUGET_SERVER=$NUGET_SERVER;export NUGET_PATH=$NUGET_PATH;    cd $basePath/Publish/DevOps/jenkins-bash;bash 01.svn-update.sh;  '"
+                sh "chroot /host bash -c 'set -e; export APPNAME=$APPNAME;export SVN_USERNAME=$SVN_USERNAME;export SVN_PASSWORD=$SVN_PASSWORD;export DOCKER_USERNAME=$DOCKER_USERNAME;export DOCKER_PASSWORD=$DOCKER_PASSWORD;export NUGET_KEY=$NUGET_KEY;export NUGET_SERVER=$NUGET_SERVER;export NUGET_PATH=$NUGET_PATH;    cd $basePath/Publish/DevOps/jenkins-bash;bash 01.svn-update.sh;  '"
             } 
         }
 
         stage('(x.4)build') {
             agent any 
             steps {
-                sh "chroot /host bash -c 'set -e; export SVN_USERNAME=$SVN_USERNAME;export SVN_PASSWORD=$SVN_PASSWORD;export DOCKER_USERNAME=$DOCKER_USERNAME;export DOCKER_PASSWORD=$DOCKER_PASSWORD;export NUGET_KEY=$NUGET_KEY;export NUGET_SERVER=$NUGET_SERVER;export NUGET_PATH=$NUGET_PATH;    cd $basePath/Publish/DevOps/build-bash; bash startup.bash;  '"
+                sh "chroot /host bash -c 'set -e; export APPNAME=$APPNAME;export SVN_USERNAME=$SVN_USERNAME;export SVN_PASSWORD=$SVN_PASSWORD;export DOCKER_USERNAME=$DOCKER_USERNAME;export DOCKER_PASSWORD=$DOCKER_PASSWORD;export NUGET_KEY=$NUGET_KEY;export NUGET_SERVER=$NUGET_SERVER;export NUGET_PATH=$NUGET_PATH;    cd $basePath/Publish/DevOps/build-bash; bash startup.bash;  '"
             } 
         }
 
         stage('(x.5)release-bash') { 
             agent any 
             steps {
-                sh "chroot /host bash -c 'set -e; export SVN_USERNAME=$SVN_USERNAME;export SVN_PASSWORD=$SVN_PASSWORD;export DOCKER_USERNAME=$DOCKER_USERNAME;export DOCKER_PASSWORD=$DOCKER_PASSWORD;export NUGET_KEY=$NUGET_KEY;export NUGET_SERVER=$NUGET_SERVER;export NUGET_PATH=$NUGET_PATH;    cd $basePath/Publish/DevOps/release-bash; bash startup.bash;  '"
+                sh "chroot /host bash -c 'set -e; export APPNAME=$APPNAME;export SVN_USERNAME=$SVN_USERNAME;export SVN_PASSWORD=$SVN_PASSWORD;export DOCKER_USERNAME=$DOCKER_USERNAME;export DOCKER_PASSWORD=$DOCKER_PASSWORD;export NUGET_KEY=$NUGET_KEY;export NUGET_SERVER=$NUGET_SERVER;export NUGET_PATH=$NUGET_PATH;    cd $basePath/Publish/DevOps/release-bash; bash startup.bash;  '"
             } 
         }
     } 

Publish/DevOps/jenkins-bash/startup.bash

@@ -3,19 +3,10 @@ set -e
 
 # cd /root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code/Publish/DevOps/jenkins-bash; bash startup.bash;
 
-#chroot /host bash -c "set -e; \
-#export SVN_USERNAME=jenkins; \
-#export SVN_PASSWORD=xxxxxx; \
-#export DOCKER_USERNAME=serset; \
-#export DOCKER_PASSWORD=xxxxxx; \
-#export NUGET_KEY=xxxxxx; \
-#export NUGET_SERVER=https://api.nuget.org/v3/index.json; \
-#export NUGET_PATH=/root/docker-data/dev/jenkins/jenkins_home/workspace/.nuget; \
-#cd /root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code/Publish/DevOps/jenkins-bash; bash startup.bash; "
-
 #---------------------------------------------------------------------
 #(x.1)²ÎÊý
 args_="
+export APPNAME=xxxxxx
 
 export SVN_USERNAME=jenkins
 export SVN_PASSWORD=xxxxxx

Publish/DevOps/release-bash/71.file-zip.sh

@@ -9,11 +9,9 @@ export basePath=/root/temp/svn
 
 export version=`grep '<Version>' $(grep '<pack>\|<publish>' ${basePath} -r --include *.csproj -l | head -n 1) | grep -oP '>(.*)<' | tr -d '<>'`
 
-# "
-
-export name=Sers
-
+export APPNAME=xxxxxx
 
+# "
 
 #----------------------------------------------
 echo "压缩文件"
@@ -29,7 +27,7 @@ for dirname in \`ls /root/code/Publish/release/release\`
 do
   if [ -d \$releasePath/release/\$dirname ]
   then
-    filezip zip -p -i \$releasePath/release/\$dirname -o \$releasePath/release-zip/${name}-\${dirname}-${version}.zip 
+    filezip zip -p -i \$releasePath/release/\$dirname -o \$releasePath/release-zip/${APPNAME}-\${dirname}-${version}.zip 
   fi
 done
 

Publish/DevOps/release-bash/startup.bash

@@ -6,12 +6,13 @@ set -e
 #(x.1)参数
 args_="
 
+export APPNAME=xxxxxx
+
 export DOCKER_USERNAME=serset
 export DOCKER_PASSWORD=xxx
 
 export NUGET_SERVER=https://api.nuget.org/v3/index.json
 export NUGET_KEY=xxxxxxxxxx
-
 # "