Kaynağa Gözat

Merge branch 'feature/temp' of serset/Vit.Linq into develop

lith 1 yıl önce
ebeveyn
işleme
3edc18c6af

+ 6 - 4
Publish/DevOps2/release-bash/71.file-zip.sh

@@ -16,10 +16,7 @@ export APPNAME=xxxxxx
 #----------------------------------------------
 echo "71.file-zip.sh"
 
-if [ ! -d "$basePath/Publish/release" ]; then
-	echo '71.file-zip.sh -> skip for no files exist'
-	exit 0
-fi
+
 
 
 docker run --rm -i \
@@ -27,6 +24,11 @@ docker run --rm -i \
 serset/filezip bash -c "
 set -e
 
+if [ ! -d \"/root/code/Publish/release/release\" ]; then
+	echo '71.file-zip.sh -> skip for no files exist'
+	exit 0
+fi
+
 releasePath=/root/code/Publish/release
 rm -rf \$releasePath/release-zip
 

+ 8 - 6
Publish/DevOps2/release-bash/72.nuget-push.sh

@@ -18,17 +18,19 @@ export NUGET_KEY=xxxxxxxxxx
 #----------------------------------------------
 echo "72.nuget-push.sh"
 
-if [ ! -d "$basePath/Publish/release/release/nuget" ] then
-    echo '72.nuget-push.sh -> skip for no nuget files exist'
-    exit 0
-fi
-
-
 docker run -i --rm \
 --env LANG=C.UTF-8 \
 -v $basePath:/root/code \
 serset/dotnet:sdk-6.0 \
 bash -c "
+
+
+if [ ! -d \"/root/code/Publish/release/release/nuget\" ]; then
+    echo '72.nuget-push.sh -> skip for no nuget files exist'
+    exit 0
+fi
+
+
 for file in /root/code/Publish/release/release/nuget/*.nupkg
 do
     echo nuget push \$file

+ 8 - 7
Publish/DevOps2/release-bash/73.docker-image-build-push.sh

@@ -24,15 +24,16 @@ export DOCKER_BuildxExtArgs=
 #---------------------------------------------------------------------
 echo "73.docker-image-build-push.sh"
 
-if [ ! -d "$basePath/Publish/release/release/docker-image" ]; then
-    echo '##73.docker-image-build-push.sh -> skip for no docker image files exist'
-    exit 0
-fi
+if [ -d "$basePath/Publish/release/release/docker-image" ]; then
 
-if [ "$DOCKER_Buildx" != "false" ]; then
-    sh 75.docker-image-build-push_cross.bash
+	if [ "$DOCKER_Buildx" != "false" ]; then
+	    sh 75.docker-image-build-push_cross.bash
+	else
+	    sh 74.docker-image-build-push_amd64.bash
+	fi
 else
-    sh 74.docker-image-build-push_amd64.bash
+    echo '73.docker-image-build-push.sh -> skip for no docker image files exist'
 fi
 
 
+