Build: Consolidate archives and packages configuration#28760
Merged
rjernst merged 5 commits intoelastic:masterfrom Feb 22, 2018
Merged
Build: Consolidate archives and packages configuration#28760rjernst merged 5 commits intoelastic:masterfrom
rjernst merged 5 commits intoelastic:masterfrom
Conversation
This commit moves the distribution specific tasks into the respective archives and packages builds. The collocation of common and distribution specific tasks make it much easier to reason about what is expected in a particular distribution.
a63e7d0 to
a935a2f
Compare
nik9000
approved these changes
Feb 21, 2018
distribution/archives/build.gradle
Outdated
| // need this so Zip/Tar tasks get basic defaults... | ||
| apply plugin: 'base' | ||
|
|
||
| // CopySpec does not make it easy to create an empty director so we |
| @@ -1,85 +1 @@ | |||
| /* | |||
Member
There was a problem hiding this comment.
We should probably keep the license header.
Member
There was a problem hiding this comment.
Talking to @rjernst, I think we're fine dropping the license header but we should have a comment about how the build is configured in the project above. If we drop the file altogether and use settings.gradle to configure the directory then that is fine too.
| @@ -1,61 +0,0 @@ | |||
| import org.elasticsearch.gradle.LoggedExec | |||
|
|
|||
| /* | |||
Member
There was a problem hiding this comment.
I think we should keep the license header here too.
And a comment that the actual build is configured by the parent.
| with noticeFile | ||
| } | ||
|
|
||
| task buildDeb(type: Deb) { |
Member
There was a problem hiding this comment.
I think it is worth commenting that these are configured on this project but are part of the packaging for the subprojects.
| @@ -17,56 +17,7 @@ | |||
| * under the License. | |||
| */ | |||
|
|
|||
Member
There was a problem hiding this comment.
I think it is worth adding a description or a comment explaining what this project is for. Also it'd be nice to explain that the vast majority of its build is configured in the parent project. I mean, it is obvious to me when I see a nearly empty gradle file that I have to look up one level, but we may as well make it more obvious.
| artifacts { | ||
| 'default' buildTar | ||
| } | ||
|
|
Member
There was a problem hiding this comment.
We should probably keep the license file and a comment explaining that the build is handled by the parent.
| } | ||
|
|
||
| subprojects { | ||
| apply plugin: 'distribution' |
Member
There was a problem hiding this comment.
I think it is worth explaining here that we keep the subprojects at all so we can use project substitution to resolve to the individual artifacts because project substitution only works with the default configuration.
rjernst
added a commit
that referenced
this pull request
Feb 22, 2018
This commit moves the distribution specific tasks into the respective archives and packages builds. The collocation of common and distribution specific tasks make it much easier to reason about what is expected in a particular distribution.
martijnvg
added a commit
that referenced
this pull request
Feb 22, 2018
* es/master: (143 commits) Revert "Disable BWC tests for build issues" Remove AcknowledgedRestListener in favour of RestToXContentListener (#28724) Build: Consolidate archives and packages configuration (#28760) Skip some plugins service tests on Windows Migrate some *ResponseTests to AbstractStreamableXContentTestCase (#28749) Disable BWC tests for build issues Ensure that azure stream has socket privileges (#28751) [DOCS] Fixed broken link. Pass InputStream when creating XContent parser (#28754) [DOCS] Changed to use transient setting to reenabled allocation. Closes #27677 Delay path expansion on Windows [TEST] replace randomAsciiAlphanumOfLengthBetween with randomAsciiLettersOfLengthBetween [Tests] Extract the testing logic for Google Cloud Storage (#28576) [Docs] Update links to java9 docs (#28750) version set in ingest pipeline (#27573) Revert "Add startup logging for standalone tests" Tests: don't wait for completion while trying to get completed task Add 5.6.9 snapshot version [Docs] Java high-level REST client : clean up (#28703) Updated distribution outputs in contributing docs ...
martijnvg
added a commit
that referenced
this pull request
Feb 22, 2018
* es/6.x: (140 commits) Remove AcknowledgedRestListener in favour of RestToXContentListener (#28724) Migrate some *ResponseTests to AbstractStreamableXContentTestCase (#28749) Revert "Disable BWC tests for build issues" Skip some plugins service tests on Windows Build: Consolidate archives and packages configuration (#28760) Ensure that azure stream has socket privileges (#28773) Disable BWC tests for build issues Pass InputStream when creating XContent parser (#28754) [DOCS] Fixed broken link. [DOCS] Changed to use transient setting to reenabled allocation. Closes #27677 Delay path expansion on Windows [TEST] replace randomAsciiAlphanumOfLengthBetween with randomAsciiLettersOfLengthBetween REST high-level client: add support for Rollover Index API (#28698) [Tests] Extract the testing logic for Google Cloud Storage (#28576) Moved Grok helper code to a separate Gradle module and let ingest-common module depend on it. version set in ingest pipeline (#27573) [Docs] Update links to java9 docs (#28750) Revert "Add startup logging for standalone tests" Tests: don't wait for completion while trying to get completed task Add 5.6.9 snapshot version ...
rjernst
added a commit
that referenced
this pull request
Feb 22, 2018
This was accidentally broken in #28760.
rjernst
added a commit
that referenced
this pull request
Feb 22, 2018
This was accidentally broken in #28760.
sebasjm
pushed a commit
to sebasjm/elasticsearch
that referenced
this pull request
Mar 10, 2018
This commit moves the distribution specific tasks into the respective archives and packages builds. The collocation of common and distribution specific tasks make it much easier to reason about what is expected in a particular distribution.
sebasjm
pushed a commit
to sebasjm/elasticsearch
that referenced
this pull request
Mar 10, 2018
This was accidentally broken in elastic#28760.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit moves the distribution specific tasks into the respective
archives and packages builds. The collocation of common and distribution
specific tasks make it much easier to reason about what is expected in a
particular distribution.