honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-18 10:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't build packages on non Linux (#48246)

Browse Source 
* Don't build packages on non Linux

Closes #47007

* Explicitly exclude windows only
This commit is contained in:
Alpar Torok 2019-10-21 17:09:12 +03:00
parent 5729c04df2
commit cdfac9dfb0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.ci/os.ps1
View File

@ -27,10 +27,6 @@ New-Item -ItemType directory -Path \tmp
$ErrorActionPreference="Continue" $ErrorActionPreference="Continue"
# TODO: remove the task exclusions once dependencies are set correctly and these don't run for Windows or buldiung the deb on windows is fixed # TODO: remove the task exclusions once dependencies are set correctly and these don't run for Windows or buldiung the deb on windows is fixed
& .\gradlew.bat -g "C:\Users\$env:username\.gradle" --parallel --scan --console=plain destructiveDistroTest ` & .\gradlew.bat -g "C:\Users\$env:username\.gradle" --parallel --scan --console=plain destructiveDistroTest
-x :distribution:packages:buildOssDeb `
-x :distribution:packages:buildDeb `
-x :distribution:packages:buildOssRpm `
-x :distribution:packages:buildRpm `
exit $? exit $?

4
distribution/packages/build.gradle
View File

@ -19,6 +19,7 @@
import org.elasticsearch.gradle.LoggedExec import org.elasticsearch.gradle.LoggedExec
import org.elasticsearch.gradle.MavenFilteringHack import org.elasticsearch.gradle.MavenFilteringHack
import org.redline_rpm.header.Flags import org.redline_rpm.header.Flags
import org.elasticsearch.gradle.OS
import java.nio.file.Files import java.nio.file.Files
import java.nio.file.Path import java.nio.file.Path
@ -105,6 +106,9 @@ addProcessFilesTask('rpm', false, false)
// is the same // is the same
Closure commonPackageConfig(String type, boolean oss, boolean jdk) { Closure commonPackageConfig(String type, boolean oss, boolean jdk) {
return { return {
onlyIf {
OS.current().equals(OS.WINDOWS) == false
}
dependsOn "process${oss ? 'Oss' : ''}${jdk ? '' : 'NoJdk'}${type.capitalize()}Files" dependsOn "process${oss ? 'Oss' : ''}${jdk ? '' : 'NoJdk'}${type.capitalize()}Files"
packageName "elasticsearch${oss ? '-oss' : ''}" packageName "elasticsearch${oss ? '-oss' : ''}"
arch (type == 'deb' ? 'amd64' : 'X86_64') arch (type == 'deb' ? 'amd64' : 'X86_64')