Cherry-pick #7783 to 6.x: X-Pack binaries#8442
Merged
graphaelli merged 1 commit intoelastic:6.xfrom Sep 27, 2018
Merged
Conversation
This commit implements the necessary logic to build licensed beats, before that commit, the OSS and the License binaries were exactly the same. Changes: - Added `mage.CrossBuildXPack()` to build the elastic licensed beat. x-pack/beatname - Changed the packages.yml to include the artifact from the x-pack folder. - Added `mage.UseElasticBeatPackaging()` to build the packages with the new binaries. - Added `mage.UseElasticBeatWithoutXPackPackaging()` allow to keep the previous behavior. - `make check` and `make fmt` will use the right license for the x-pack folder. Co-authored-by: Carlos Pérez-Aradros Herce <exekias@gmail.com> Co-authored-by: Pier-Hugues Pellerin <phpellerin@gmail.com> (cherry picked from commit bcb0531)
exekias
approved these changes
Sep 27, 2018
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
2 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.
Cherry-pick of PR #7783 to 6.x branch. Original message:
This change brings with-xpack binaries building by doing this:
Introduce
x-pack/<beatname>/main.goand itscmdpackage. These take oss beats RootCmd and inject X-Pack features on it.The existing
magefile.gogains awareness of this and uses it to build and package the x-pack version.I believe this is the minimal change we would need to just have different binaries. If modules are introduced they will require more packaging changes to take them into account.