auto commit 1.6

Author: lith

.github/workflows/action-main.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
 
       # Runs a set of commands using the runners shell
-      - name: Run startup.sh
+      - name: Run startup.bash
         run: |
            set -e
            echo start build

Publish/DevOps/github/71.docker-image-build.sh

@@ -7,7 +7,7 @@ args_="
 
 export codePath=/root/temp/svn
 
-export version=`grep '<Version>' "${codePath}" -r --include Sers.Core.csproj | grep -oP '>(.*)<' | tr -d '<>'`
+export version=`grep '<Version>' ${codePath} -r --include *.csproj | grep -oP '>(.*)<' | tr -d '<>'`
 
 export DOCKER_USERNAME=serset
 export DOCKER_PASSWORD=xxx
@@ -47,8 +47,7 @@ docker buildx ls
 #---------------------------------------------------------------------
 #(x.3)docker-构建多架构镜像（ arm、arm64 和 amd64 ）并推送到 Docker Hub
 
-#docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-
+docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
 
 
 dockerPath=$codePath/Publish/release/release/docker-image
@@ -58,7 +57,7 @@ do
   if [ -d $dockerPath/$dockerName ]
   then 
     echo "docker build $dockerName"
-    echo docker buildx build $dockerPath/$dockerName -t $DOCKER_USERNAME/$dockerName:$version -t $DOCKER_USERNAME/$dockerName --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
+    docker buildx build $dockerPath/$dockerName -t $DOCKER_USERNAME/$dockerName:$version -t $DOCKER_USERNAME/$dockerName --platform=linux/amd64,linux/arm64,linux/arm/v7 --push
   fi
 done
 

Publish/DevOps/github/90.release-build.sh

@@ -24,7 +24,7 @@ echo "(x.2)发布文件-压缩"
 
 docker run --rm -i \
 -v $codePath:/root/code \
-serset/filezip dotnet FileZip.dll zip -p -i /root/code/Publish/release/release -o /root/code/Publish/release/${name}-${version}.zip 
+serset/filezip filezip zip -p -i /root/code/Publish/release/release -o /root/code/Publish/release/${name}-${version}.zip