lith 3 anos atrás
pai
commit
934e73bcfe

+ 4 - 1
Publish/DevOps/build-bash/30.nuget-pack.sh

@@ -8,9 +8,12 @@ set -e
 args_="
 
 export basePath=/root/temp/svn
+export _nugetPath=$basePath/Publish/release/.nuget
 
 # "
 
+if [ ! $_nugetPath ]; then _nugetPath=$basePath/Publish/release/.nuget; fi
+
 mkdir -p $basePath/Publish/release/release/nuget
 nugetPath=Publish/release/release/nuget
 
@@ -20,7 +23,7 @@ nugetPath=Publish/release/release/nuget
 echo "(x.2)nuget-pack"
 docker run -i --rm \
 --env LANG=C.UTF-8 \
--v $basePath/Publish/release/.nuget:/root/.nuget \
+-v $_nugetPath:/root/.nuget \
 -v $basePath:/root/code \
 serset/dotnet:sdk-6.0 \
 bash -c "

+ 4 - 1
Publish/DevOps/build-bash/40.Station-publish.sh

@@ -6,9 +6,12 @@ set -e
 args_="
 
 export basePath=/root/temp/svn
+export _nugetPath=$basePath/Publish/release/.nuget
 
 # "
 
+if [ ! $_nugetPath ]; then _nugetPath=$basePath/Publish/release/.nuget; fi
+
 
 #----------------------------------------------
 echo "(x.2)获取netVersion" 
@@ -28,7 +31,7 @@ mkdir -p $publishPath
 
 docker run -i --rm \
 --env LANG=C.UTF-8 \
--v $basePath/Publish/release/.nuget:/root/.nuget \
+-v $_nugetPath:/root/.nuget \
 -v $basePath:/root/code \
 serset/dotnet:sdk-6.0 \
 bash -c "

+ 2 - 3
Publish/DevOps/jenkins-bash/startup.bash

@@ -17,11 +17,12 @@ export DOCKER_PASSWORD=xxxxxx
 export NUGET_SERVER=https://api.nuget.org/v3/index.json
 export NUGET_KEY=xxxxxx
 
+export _nugetPath=/root/docker-data/dev/jenkins/jenkins_home/workspace/.nuget
+
 # "
 
 export name=Sers
 
-
 #----------------------------------------------
 #(x.2)µ±Ç°Â·¾¶ 
 curPath=$PWD
@@ -46,7 +47,6 @@ echo '(x.4)build'
 cd $basePath/Publish/DevOps/build-bash; bash startup.bash;
 
 
-
 #---------------------------------------------- 
 echo '(x.5)release-bash'
 cd $basePath/Publish/DevOps/release-bash; bash startup.bash;
@@ -54,7 +54,6 @@ cd $basePath/Publish/DevOps/release-bash; bash startup.bash;
 
 
 
-
 #----------------------------------------------
 #(x.9)
 #cd $curPath