DevOps3

.github/workflows/action-ki_multibranch.yml

@@ -1,6 +1,6 @@
 # This is a basic workflow to help you get started with Actions
 
-name: ki_multibranch
+name: ki_multibranch_3.1
 
 # Controls when the action will run. 
 on:
@@ -37,14 +37,14 @@ jobs:
            set -e
            echo start build
 
-           # export DOCKER_ImagePrefix="serset/"
-           # export DOCKER_USERNAME="${{ secrets.DOCKER_USERNAME  }}"
-           # export DOCKER_PASSWORD="${{ secrets.DOCKER_PASSWORD }}"
+           export DOCKER_ImagePrefix="serset/"
+           export DOCKER_USERNAME="${{ secrets.DOCKER_USERNAME  }}"
+           export DOCKER_PASSWORD="${{ secrets.DOCKER_PASSWORD }}"
            export NUGET_SERVER="${{ secrets.NUGET_SERVER  }}"
            export NUGET_KEY="${{ secrets.NUGET_KEY }}"
            export WebDav_BaseUrl="${{ secrets.WebDav_BaseUrl }}"
            export WebDav_User="${{ secrets.WebDav_User }}"
-           cd ./Publish/DevOps2/github-bash
+           cd ./Publish/DevOps3/github-bash
            bash startup.bash
            echo build succeed!
            
@@ -74,4 +74,4 @@ jobs:
           upload_url: ${{ steps.release_create.outputs.upload_url }}
           asset_path: ${{ env.release_dirPath }}/${{ env.appName }}-nuget-${{ env.release_version }}.zip
           asset_name: ${{ env.appName }}-nuget-${{ env.release_version }}.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip

Publish/DevOps2/build-bash/40.Station-publish-multiple.bash

@@ -1,46 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-# args
-args_="
-
-export basePath=/root/temp/svn
-export NUGET_PATH=$basePath/Publish/release/.nuget
-
-# "
-
-
-curPath=$PWD
-
-cd $curPath/../../..
-export basePath=$PWD
-cd $curPath
-
-#----------------------------------------------
-echo "40.Station-publish-multiple.bash"
-
-for netVersion in net5.0 netcoreapp3.1 netcoreapp3.0 netcoreapp2.2 netcoreapp2.1
-do
-	echo "#2.1 publish netVersion: $netVersion"
-
-	echo "#2.2 change netVersion to $netVersion in csproj"
-	sed -i 's/net6.0/'"$netVersion"'/g' `find ${basePath} -name *.csproj -exec grep '<publish>' -l {} \;`
-
-
-	echo "#2.3 sh 40.Station-publish.sh"
-	cd $curPath
-	sh 40.Station-publish.sh
-
-
-	echo "#2.4 change back netVersion to net6.0 in csproj"
-	sed -i 's/'"$netVersion"'/net6.0/g' `find ${basePath} -name *.csproj -exec grep '<publish>' -l {} \;`
-
-done
-
-
-
-cd $curPath
-
-
-

Publish/DevOps2/environment/build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh

@@ -1,25 +0,0 @@
-set -e
-
-#---------------------------------------------------------------------
-# args
-args_="
-
-export basePath=/root/temp/svn
-export netVersion=net6.0
-export publishPath=\"$basePath/Publish/release/release/Station($netVersion)\"
-
-# "
-
-
-
-#----------------------------------------------
-echo '#build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh'
-echo '  -> nothing to do'
-
-# mkdir -p "$basePath/Publish/release/release/ServiceCenter($netVersion)"
-# cp -rf "$publishPath/ServiceCenter/." "$basePath/Publish/release/release/ServiceCenter($netVersion)/ServiceCenter"
-
-
-
-
-

Publish/DevOps2/environment/build-bash__41.extra-publish.sh

@@ -1,22 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-# args
-args_="
-
-export basePath=/root/temp/svn
-export NUGET_PATH=$basePath/Publish/release/.nuget
-
-# "
-
-if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
-
-
-#---------------------------------------------------------------------
-echo '#build-bash__41.extra-publish.sh'
-echo '  -> nothing to do'
- 
-
-
-

Publish/DevOps2/environment/build-bash__52.docker-extra-copy.sh

@@ -1,18 +0,0 @@
-set -e
-
-
-#---------------------------------------------------------------------
-# args
-
-args_="
-
-export basePath=/root/temp/svn
-export NUGET_PATH=$basePath/Publish/release/.nuget
-
-# "
-
-
-#---------------------------------------------------------------------
-echo '#build-bash__52.docker-extra-copy.sh'
-
-echo '  -> nothing to do'

Publish/DevOps2/environment/github-bash__publish-multiple-netcore-version.txt.bak

@@ -1,5 +0,0 @@
-
-if this file exists, 
-will publish multiple netcore version 
-like net5.0 netcoreapp3.1 netcoreapp3.0 netcoreapp2.2 netcoreapp2.1
-in github actions 

Publish/DevOps2/environment/readme.md

@@ -1,23 +0,0 @@
-
-
-
-# build-bash
-extra steps when building, all sh files could be remove if not needed.
-
-
-
-
-
-
-
-
-
-# github-bash__publish-multiple-netcore-version.txt
-if this file exists, 
-will publish multiple netcore version 
-like net5.0 netcoreapp3.1 netcoreapp3.0 netcoreapp2.2 netcoreapp2.1
-in github actions 
-
-
-
-

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

@@ -1,7 +1,7 @@
 set -e
 
 # export versionSuffix='.1234.preview'
-# bash 20.change-release-version.bash
+# bash 19.get-app-version.bash
 
 
 #---------------------------------------------------------------------

Publish/DevOps2/build-bash/20.change-app-version.bash → Publish/DevOps3/build-bash/20.change-app-version.bash

@@ -1,7 +1,7 @@
 set -e
 
 # export versionSuffix='.1234.preview'
-# bash 20.change-release-version.bash
+# bash 20.change-app-version.bash
 
 
 #---------------------------------------------------------------------

Publish/DevOps2/build-bash/40.Station-publish.sh → Publish/DevOps3/build-bash/40.Station-publish.sh

@@ -16,13 +16,13 @@ if [ ! $NUGET_PATH ]; then NUGET_PATH=$basePath/Publish/release/.nuget; fi
 #----------------------------------------------
 echo "#40.Station-publish.sh -> find projects and build"
 
-
-
+export devOpsPath="$PWD/.."
 
 docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $NUGET_PATH:/root/.nuget \
--v $basePath:/root/code \
+-v "$basePath":/root/code \
+-v "$basePath":"$basePath" \
 serset/dotnet:sdk-6.0 \
 bash -c "
 set -e
@@ -72,7 +72,7 @@ fi
 
 
 #4 copy extra release files
-bashFile=\"\$basePath/Publish/DevOps2/environment/build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh\"
+bashFile=\"$devOpsPath/environment/build-bash__40.Station-publish__#4_copyExtraReleaseFiles.sh\"
 if [ -f \"\$bashFile\" ]; then
 	echo '#4 copy extra release files'
 	sh \"\$bashFile\"

Publish/DevOps2/build-bash/41.extra-publish.sh → Publish/DevOps3/build-bash/41.extra-publish.sh

@@ -13,7 +13,7 @@ export NUGET_PATH=$basePath/Publish/release/.nuget
 
 #---------------------------------------------------------------------
 #41.extra-publish.sh
-bashFile="$basePath/Publish/DevOps2/environment/build-bash__41.extra-publish.sh"
+bashFile="$PWD/../environment/build-bash__41.extra-publish.sh"
 if [ -f "$bashFile" ]; then
 	echo '#41.extra-publish.sh'
 	sh "$bashFile"

Publish/DevOps2/build-bash/52.docker-extra-copy.sh → Publish/DevOps3/build-bash/52.docker-extra-copy.sh

@@ -13,7 +13,7 @@ export NUGET_PATH=$basePath/Publish/release/.nuget
 
 #---------------------------------------------------------------------
 #52.docker-extra-copy.sh
-bashFile="$basePath/Publish/DevOps2/environment/build-bash__52.docker-extra-copy.sh"
+bashFile="$PWD/../environment/build-bash__52.docker-extra-copy.sh"
 if [ -f "$bashFile" ]; then
 	echo '#52.docker-extra-copy.sh'
 	sh "$bashFile"

Publish/DevOps2/build-bash/startup.bash → Publish/DevOps3/build-bash/startup.bash

@@ -1,13 +1,13 @@
 set -e
 
-# cd /root/docker-data/dev/jenkins/jenkins_home/workspace/Repo/Sers/code/Publish/DevOps/build-bash;bash startup.bash;
+# cd build-bash; bash startup.bash;
 
 #----------------------------------------------
 # cur path
 curPath=$PWD
 
 cd $curPath/../../..
-export basePath=$PWD
+export basePath="$PWD"
 cd $curPath
 
 

Publish/DevOps3/environment/readme.md

@@ -0,0 +1,13 @@
+
+# DevOps 3.1
+> 2024-04-27
+
+# build-bash
+extra steps when building, all sh files could be remove if not needed.
+
+
+
+
+
+
+

Publish/DevOps2/github-bash/74.github-push-to-webdav.sh → Publish/DevOps3/github-bash/74.github-push-to-webdav.sh

@@ -24,7 +24,7 @@ if [ -z "$WebDav_BaseUrl" ]; then
 	echo "github skip pushing release file to WebDav because invalid WebDav endpoint"
 else
 	echo "github push release file to WebDav"
-	bash $basePath/Publish/DevOps2/release-bash/78.push-releaseFiles-to-webdav.bash;
+	bash "$PWD/../release-bash/78.push-releaseFiles-to-webdav.bash";
 fi
 
 

Publish/DevOps2/github-bash/startup.bash → Publish/DevOps3/github-bash/startup.bash

@@ -1,6 +1,6 @@
 set -e
 
-# cd /root/temp/svn/Publish/DevOps2/github-bash;bash startup.bash;
+# cd github-bash; bash startup.bash;
 
 #---------------------------------------------------------------------
 # args
@@ -24,33 +24,31 @@ export WebDav_User="username:pwd"
 curPath=$PWD
 
 cd $curPath/../../..
-export basePath=$PWD
+export basePath="$PWD"
 cd $curPath
 
+export devOpsPath="$PWD/.."
+
 # export basePath=/root/temp/svn
 
 if [ ! $APPNAME ]; then 
-	export APPNAME=$(cat "$basePath/Publish/DevOps2/environment/env.APPNAME.txt" | tr -d '\n')
+	export APPNAME=$(cat "$devOpsPath/environment/env.APPNAME.txt" | tr -d '\n')
 	echo "APPNAME: [${APPNAME}]" 
 fi
 
 #---------------------------------------------- 
 echo '#1 build'
-cd $basePath/Publish/DevOps2/build-bash; bash startup.bash;
-
-if [ -f "$basePath/Publish/DevOps2/environment/github-bash__publish-multiple-netcore-version.txt" ]; then
-	cd $basePath/Publish/DevOps2/build-bash; bash 40.Station-publish-multiple.bash;
-fi
+cd "$devOpsPath/build-bash"; bash startup.bash;
 
 #---------------------------------------------- 
 echo '#2 release-bash'
-cd $basePath/Publish/DevOps2/release-bash; bash startup.bash;
+cd "$devOpsPath/release-bash"; bash startup.bash;
  
 
 
 #----------------------------------------------
 echo "#3 get appVersion" 
-cd $basePath/Publish/DevOps2/build-bash; source 19.get-app-version.bash;
+cd "$devOpsPath/build-bash"; source 19.get-app-version.bash;
 
 
 

Publish/DevOps2/jenkins-bash/CICD.ki.git_Multibranch.deploy.jenkinsfile → Publish/DevOps3/jenkins-bash/CICD.ki.git_Multibranch.deploy.jenkinsfile

@@ -12,9 +12,9 @@ pipeline {
     environment {
         // get APPNAME
         // APPNAME = "Sers"
-        APPNAME = readFile("Publish/DevOps2/environment/env.APPNAME.txt")
+        APPNAME = readFile("Publish/DevOps3/environment/env.APPNAME.txt")
 
-        envName = readFile("Publish/DevOps2/environment/env.envName.txt")
+        envName = readFile("Publish/DevOps3/environment/env.envName.txt")
         versionSuffix = "-${envName}${env.build_number}"
 
         //basePath = "/root/docker-cache/jenkins/jenkins_home/workspace/${APPNAME}/${envName}/${env.BRANCH_NAME}/${env.build_number}"
@@ -70,10 +70,10 @@ pipeline {
             steps {
                 script {
                     echo "#2.1 change-app-version"
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export versionSuffix=$versionSuffix;    cd $codePath/Publish/DevOps2/build-bash; source 22.add-suffix-to-app-version.bash;    echo -n \"\$nextAppVersion\" > $codePath/Publish/DevOps2/environment/env.appVersion.txt '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export versionSuffix=$versionSuffix;    cd $codePath/Publish/DevOps3/build-bash; source 22.add-suffix-to-app-version.bash;    echo -n \"\$nextAppVersion\" > $codePath/Publish/DevOps3/environment/env.appVersion.txt '"
 
                     echo "#2.2 get app version"
-                    env.appVersion = readFile("Publish/DevOps2/environment/env.appVersion.txt")
+                    env.appVersion = readFile("Publish/DevOps3/environment/env.appVersion.txt")
                     echo "-------- appVersion: [${env.appVersion}]"
                 }
             }
@@ -83,7 +83,7 @@ pipeline {
             when { expression { env.inputChoice == "yes" } }
             steps {
                 script {
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME; export NUGET_PATH=$NUGET_PATH;    cd $codePath/Publish/DevOps2/build-bash; sh startup.bash;  '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME; export NUGET_PATH=$NUGET_PATH;    cd $codePath/Publish/DevOps3/build-bash; sh startup.bash;  '"
                 }
             }
         }
@@ -92,7 +92,7 @@ pipeline {
             when { expression { env.inputChoice == "yes" && env.build_crossPlatform == "yes" } }
             steps {
                 script {
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME; export NUGET_PATH=$NUGET_PATH;    cd $codePath/Publish/DevOps2/build-bash; sh 40.Station-publish-multiple.bash;  '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME; export NUGET_PATH=$NUGET_PATH;    cd $codePath/Publish/DevOps3/build-bash; sh 40.Station-publish-multiple.bash;  '"
                 }
             }
         }
@@ -101,7 +101,7 @@ pipeline {
             when { expression { env.inputChoice == "yes" } }
             steps {
                 script {
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME;export NUGET_PATH=$NUGET_PATH;    export NUGET_SERVER=$NUGET_SERVER;export NUGET_KEY=$NUGET_KEY;  export DOCKER_Buildx=${env.DOCKER_Buildx};export DOCKER_ImagePrefix=${env.DOCKER_ImagePrefix};export DOCKER_USERNAME=${env.DOCKER_USERNAME};export DOCKER_PASSWORD=${env.DOCKER_PASSWORD};export DOCKER_BuildxExtArgs=\"--output=type=registry,registry.insecure=true\";    cd $codePath/Publish/DevOps2/release-bash; sh startup.bash;  '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export APPNAME=$APPNAME;export NUGET_PATH=$NUGET_PATH;    export NUGET_SERVER=$NUGET_SERVER;export NUGET_KEY=$NUGET_KEY;  export DOCKER_Buildx=${env.DOCKER_Buildx};export DOCKER_ImagePrefix=${env.DOCKER_ImagePrefix};export DOCKER_USERNAME=${env.DOCKER_USERNAME};export DOCKER_PASSWORD=${env.DOCKER_PASSWORD};export DOCKER_BuildxExtArgs=\"--output=type=registry,registry.insecure=true\";    cd $codePath/Publish/DevOps3/release-bash; sh startup.bash;  '"
                 }
             }
         }
@@ -110,7 +110,7 @@ pipeline {
             when { expression { env.inputChoice == "yes" && env.WebDav_BaseUrl != "  " } }
             steps {
                 script {
-                    sshCommand remote: remote, command:  "sh -c 'set -e; export basePath=\"$codePath\"; export APPNAME=$APPNAME; export appVersion=\"$appVersion\";   export WebDav_BaseUrl=\"$WebDav_BaseUrl\"; export WebDav_User=\"$WebDav_User\";    cd $codePath/Publish/DevOps2/release-bash; sh 78.push-releaseFiles-to-webdav.bash;  '"
+                    sshCommand remote: remote, command:  "sh -c 'set -e; export basePath=\"$codePath\"; export APPNAME=$APPNAME; export appVersion=\"$appVersion\";   export WebDav_BaseUrl=\"$WebDav_BaseUrl\"; export WebDav_User=\"$WebDav_User\";    cd $codePath/Publish/DevOps3/release-bash; sh 78.push-releaseFiles-to-webdav.bash;  '"
                 }
             }
         }

Publish/DevOps2/release-bash/startup.bash → Publish/DevOps3/release-bash/startup.bash

@@ -20,11 +20,11 @@ export NUGET_KEY=xxxxxxxxxx
 
 #----------------------------------------------
 # cur path
-curPath=$PWD
+curPath="$PWD"
 
-cd $curPath/../../..
-export basePath=$PWD
-cd $curPath
+cd "$curPath/../../.."
+export basePath="$PWD"
+cd "$curPath"
 
 # export basePath=/root/temp/svn
 
@@ -32,7 +32,7 @@ cd $curPath
 
 #----------------------------------------------
 echo "#1 get appVersion"
-cd $basePath/Publish/DevOps2/build-bash; source 19.get-app-version.bash;
+cd "$curPath/../build-bash"; source 19.get-app-version.bash;
 
 
 
@@ -46,11 +46,11 @@ for file in *.sh
 do
     echo "-----------------------------------------------------------------"
     echo "[$(date "+%H:%M:%S")] sh $file"
-    sh $file
+    sh "$file"
 done
 
 
-
+cd "$curPath"
 
 
 

clean-temp.bat

@@ -1,5 +1,5 @@
-cd Publish\DevOps2\build-cmd
-VsTool.exe delete --path "..\..\..\src" --file "*.suo|*.user" --directory "obj|bin|.vs|packages"
+cd Publish\DevOps3\build-cmd
+VsTool.exe delete --path "..\..\.." --file "*.suo|*.user" --directory "obj|bin|.vs|packages"
 
 
 rd /s/q ..\..\release