honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename artifact produced by the build to include -min (#1251) (#1271) 

Signed-off-by: Xue Zhou <xuezhou@amazon.com>

Co-authored-by: Xue Zhou <85715413+xuezhou25@users.noreply.github.com>
This commit is contained in:
Daniel Doubrovkine (dB.) 2021-09-22 10:52:24 -04:00 committed by GitHub
parent c103465505
commit 86ce37f48a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/integTest/groovy/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy
View File

@ -70,7 +70,7 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT
where: where:
buildTaskName | expectedOutputArchivePath buildTaskName | expectedOutputArchivePath
"buildDarwinTar" | "darwin-tar/build/distributions/opensearch.tar.gz" "buildDarwinTar" | "darwin-tar/build/distributions/opensearch-min.tar.gz"
} }
def "applies defaults to zip tasks"() { def "applies defaults to zip tasks"() {
@ -91,7 +91,7 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT
where: where:
buildTaskName | expectedOutputArchivePath buildTaskName | expectedOutputArchivePath
"buildDarwinZip" | "darwin-zip/build/distributions/opensearch.zip" "buildDarwinZip" | "darwin-zip/build/distributions/opensearch-min.zip"
} }
def "registered distribution provides archives and directory variant"() { def "registered distribution provides archives and directory variant"() {
@ -148,8 +148,8 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT
then: "tar task executed and target folder contains plain tar" then: "tar task executed and target folder contains plain tar"
result.task(':buildProducerTar').outcome == TaskOutcome.SUCCESS result.task(':buildProducerTar').outcome == TaskOutcome.SUCCESS
result.task(':consumer:copyArchive').outcome == TaskOutcome.SUCCESS result.task(':consumer:copyArchive').outcome == TaskOutcome.SUCCESS
file("producer-tar/build/distributions/opensearch.tar.gz").exists() file("producer-tar/build/distributions/opensearch-min.tar.gz").exists()
file("consumer/build/archives/opensearch.tar.gz").exists() file("consumer/build/archives/opensearch-min.tar.gz").exists()
when: when:
result = gradleRunner("copyDir", "-Pversion=1.0").build() result = gradleRunner("copyDir", "-Pversion=1.0").build()

2
buildSrc/src/main/java/org/opensearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java
View File

@ -121,7 +121,7 @@ public class InternalDistributionArchiveSetupPlugin implements Plugin<Project> {
project.getTasks().withType(AbstractArchiveTask.class).configureEach(t -> { project.getTasks().withType(AbstractArchiveTask.class).configureEach(t -> {
String subdir = archiveTaskToSubprojectName(t.getName()); String subdir = archiveTaskToSubprojectName(t.getName());
t.getDestinationDirectory().set(project.file(subdir + "/build/distributions")); t.getDestinationDirectory().set(project.file(subdir + "/build/distributions"));
t.getArchiveBaseName().set("opensearch"); t.getArchiveBaseName().set("opensearch-min");
}); });
} }

2
distribution/docker/build.gradle
View File

@ -50,7 +50,7 @@ ext.expansions = { Architecture architecture, DockerBase base, boolean local ->
classifier = "linux-\$(arch)" classifier = "linux-\$(arch)"
} }
final String opensearch = "opensearch-${VersionProperties.getOpenSearch()}-${classifier}.tar.gz" final String opensearch = "opensearch-min-${VersionProperties.getOpenSearch()}-${classifier}.tar.gz"
/* Both the following Dockerfile commands put the resulting artifact at /* Both the following Dockerfile commands put the resulting artifact at
* the same location, regardless of classifier, so that the commands that * the same location, regardless of classifier, so that the commands that

4
distribution/packages/build.gradle
View File

@ -136,9 +136,9 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
// SystemPackagingTask overrides default archive task convention mappings, but doesn't provide a setter so we have to override the convention mapping itself // SystemPackagingTask overrides default archive task convention mappings, but doesn't provide a setter so we have to override the convention mapping itself
// Deb convention uses a '_' for final separator before architecture, rpm uses a '.' // Deb convention uses a '_' for final separator before architecture, rpm uses a '.'
if (type == 'deb') { if (type == 'deb') {
conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}_${project.version}${jdkString}_${archString}.${type}")) } conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-min_${project.version}${jdkString}_${archString}.${type}")) }
} else { } else {
conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-${project.version}${jdkString}.${archString}.${type}")) } conventionMapping.archiveFile = { objects.fileProperty().fileValue(file("${destinationDirectory.get()}/${packageName}-min-${project.version}${jdkString}.${archString}.${type}")) }
} }
String packagingFiles = "build/packaging/${jdk ? '' : 'no-jdk-'}${type}" String packagingFiles = "build/packaging/${jdk ? '' : 'no-jdk-'}${type}"