From 4247d38955fa136f0f3606643b6438b6f2efcfdd Mon Sep 17 00:00:00 2001 From: Andy Bristol Date: Thu, 24 May 2018 16:57:33 -0700 Subject: [PATCH] stable filemode for zip distributions Applies default file and directory permissions to zip distributions similar to how they're set for the tar distributions. Previously zip distributions would retain permissions they had on the build host's working tree, which could vary depending on its umask For #30799 --- distribution/archives/build.gradle | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/distribution/archives/build.gradle b/distribution/archives/build.gradle index 5d1703399aad4..337c06f41d093 100644 --- a/distribution/archives/build.gradle +++ b/distribution/archives/build.gradle @@ -104,15 +104,23 @@ tasks.withType(AbstractArchiveTask) { baseName = "elasticsearch${ subdir.contains('oss') ? '-oss' : ''}" } +Closure commonZipConfig = { + dirMode 0755 + fileMode 0644 +} + task buildIntegTestZip(type: Zip) { + configure(commonZipConfig) with archiveFiles(transportModulesFiles, 'zip', false) } task buildZip(type: Zip) { + configure(commonZipConfig) with archiveFiles(modulesFiles(false), 'zip', false) } task buildOssZip(type: Zip) { + configure(commonZipConfig) with archiveFiles(modulesFiles(true), 'zip', true) }