Skip to content

Commit b8b792f

Browse files
authored
Merge pull request #3223 from vmware/jhua/gradle-8
fix javadoc/source jar name
2 parents 02b2478 + 3cedb8c commit b8b792f

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
cd $GITHUB_WORKSPACE/g11n-ws && ./gradlew build -x test
110110
cp $GITHUB_WORKSPACE/devops/deploy/i18n-service/Dockerfile $GITHUB_WORKSPACE/publish/
111111
cd $GITHUB_WORKSPACE/publish && ls
112-
mv singleton-[0~9]*.jar i18n-service.jar && ls
112+
mv singleton-0.1.0.jar i18n-service.jar && ls
113113
docker build -t singleton .
114114
docker run -d -p 8090:8090 --name singleton singleton
115115
docker ps
@@ -150,7 +150,7 @@ jobs:
150150
cd $GITHUB_WORKSPACE/g11n-ws && ./gradlew build -x test
151151
cp $GITHUB_WORKSPACE/devops/performancetest/Dockerfile $GITHUB_WORKSPACE/publish/
152152
cd $GITHUB_WORKSPACE/publish && ls
153-
mv singleton-[0~9]*.jar i18n-service.jar && ls
153+
mv singleton-0.1.0.jar i18n-service.jar && ls
154154
cp -r $GITHUB_WORKSPACE/devops/performancetest/resource/l10n l10n
155155
docker build -t singleton .
156156
docker run -d -p 8090:8090 --name singleton singleton

g11n-ws/vip-manager-i18n/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ task copyLibs(type :Copy, dependsOn: bootJar) {
136136
task zipSingletonScripts(type: Zip,dependsOn: bootJar) {
137137
from "$rootDir/scripts/"
138138
destinationDirectory = file("$rootDir/../publish/")
139-
archiveBaseName = 'singletonScripts'
139+
archiveBaseName = "singletonScripts-$buildNumber"
140140
}
141141

142142
processResources {
@@ -251,11 +251,13 @@ if (project.hasProperty('datatype') && (project.getProperty('datatype') == 'pgdb
251251
**/
252252
task sourcesJar(type: Jar, dependsOn: classes) {
253253
archiveClassifier = 'sources'
254+
archiveBaseName = "singleton-$buildNumber"
254255
from sourceSets.main.allJava
255256
}
256257

257258
task javadocJar(type: Jar, dependsOn: javadoc) {
258259
archiveClassifier = 'javadoc'
260+
archiveBaseName = "singleton-$buildNumber"
259261
from javadoc.destinationDir
260262
}
261263

0 commit comments

Comments
 (0)