diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bc26d8cb7..e5bad2043 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -109,7 +109,7 @@ jobs: cd $GITHUB_WORKSPACE/g11n-ws && ./gradlew build -x test cp $GITHUB_WORKSPACE/devops/deploy/i18n-service/Dockerfile $GITHUB_WORKSPACE/publish/ cd $GITHUB_WORKSPACE/publish && ls - mv singleton-[0~9]*.jar i18n-service.jar && ls + mv singleton-0.1.0.jar i18n-service.jar && ls docker build -t singleton . docker run -d -p 8090:8090 --name singleton singleton docker ps @@ -150,7 +150,7 @@ jobs: cd $GITHUB_WORKSPACE/g11n-ws && ./gradlew build -x test cp $GITHUB_WORKSPACE/devops/performancetest/Dockerfile $GITHUB_WORKSPACE/publish/ cd $GITHUB_WORKSPACE/publish && ls - mv singleton-[0~9]*.jar i18n-service.jar && ls + mv singleton-0.1.0.jar i18n-service.jar && ls cp -r $GITHUB_WORKSPACE/devops/performancetest/resource/l10n l10n docker build -t singleton . docker run -d -p 8090:8090 --name singleton singleton diff --git a/g11n-ws/vip-manager-i18n/build.gradle b/g11n-ws/vip-manager-i18n/build.gradle index ca3f23f45..305db1c4e 100644 --- a/g11n-ws/vip-manager-i18n/build.gradle +++ b/g11n-ws/vip-manager-i18n/build.gradle @@ -136,7 +136,7 @@ task copyLibs(type :Copy, dependsOn: bootJar) { task zipSingletonScripts(type: Zip,dependsOn: bootJar) { from "$rootDir/scripts/" destinationDirectory = file("$rootDir/../publish/") - archiveBaseName = 'singletonScripts' + archiveBaseName = "singletonScripts-$buildNumber" } processResources { @@ -251,11 +251,13 @@ if (project.hasProperty('datatype') && (project.getProperty('datatype') == 'pgdb **/ task sourcesJar(type: Jar, dependsOn: classes) { archiveClassifier = 'sources' + archiveBaseName = "singleton-$buildNumber" from sourceSets.main.allJava } task javadocJar(type: Jar, dependsOn: javadoc) { archiveClassifier = 'javadoc' + archiveBaseName = "singleton-$buildNumber" from javadoc.destinationDir }