lith 3 years ago
parent
commit
6e431664a9

+ 1 - 1
.github/workflows/action-main.yml

@@ -34,7 +34,7 @@ jobs:
            export NUGET_SERVER="${{ secrets.NUGET_SERVER  }}"
            export NUGET_KEY="${{ secrets.NUGET_KEY }}"
            export GIT_SSH_SECRET="${{ secrets.GIT_SSH_SECRET }}"
-           cd ./Publish/DevOps
+           cd ./Publish/DevOps/github
            bash startup.sh
            echo build succeed!
 

+ 3 - 2
FileZip/Cmd/Zip.cs

@@ -36,11 +36,12 @@ namespace FileZip.Cmd
             Directory.CreateDirectory(Path.GetDirectoryName(output));
 
             float? progress = null;
-            string strProgress = ConsoleHelp.GetArg(args, "-o") ?? ConsoleHelp.GetArg(args, "--output");
+            string strProgress = ConsoleHelp.GetArg(args, "-p") ?? ConsoleHelp.GetArg(args, "--progress");
             if (strProgress == "")
             {
                 progress = 0.1f;
-            } else if (strProgress != null) 
+            }
+            else if (strProgress != null) 
             {
                 if (float.TryParse(strProgress, out var pro) && pro>0 & pro<=1) 
                 {

+ 1 - 1
FileZip/FileZip.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.5</Version>
+		<Version>1.6-temp</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>

+ 0 - 0
Publish/DevOps/20.docker-build.sh → Publish/DevOps/github/20.docker-build.sh


+ 0 - 0
Publish/DevOps/90.release-build.sh → Publish/DevOps/github/90.release-build.sh


+ 0 - 0
Publish/DevOps/91.release-github.sh → Publish/DevOps/github/91.release-github.sh


+ 4 - 2
Publish/DevOps/startup.sh → Publish/DevOps/github/startup.sh

@@ -4,7 +4,7 @@ set -e
 #(x.1)当前路径 
 curWorkDir=$PWD
 
-cd $curWorkDir/../..
+cd $curWorkDir/../../..
 export codePath=$PWD
 cd $curWorkDir
 
@@ -44,7 +44,9 @@ for file in *.sh
 do
     if [[ $file != "startup.sh" ]]
     then
-        sh $file
+        echo %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+        echo bash $file
+        bash $file
     fi
 done