Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix packaging and update beats #1256

Merged
merged 2 commits into from
Aug 6, 2018
Merged

Fix packaging and update beats #1256

merged 2 commits into from
Aug 6, 2018

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Aug 3, 2018

  • Include _beats/dev-tools/packaging/packages.yml again as needed.
  • Update beats framework to b84e083
  • Exclude dmg build in customizePackaging in magefile.go (cc @andrewkroh)

@simitt simitt changed the title Fix packaging Fix packaging and update beats Aug 3, 2018
jalvz
jalvz reviewed Aug 3, 2018
View reviewed changes
script/update_beats.sh
@@ -27,7 +27,6 @@ rsync -crpv --delete \
--exclude="dev-tools/jenkins_ci.ps1" \
--exclude="dev-tools/jenkins_intake.sh" \
--exclude="dev-tools/packaging/preference-pane/***" \
--exclude="dev-tools/packaging/packages.yml" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯

jalvz
jalvz approved these changes Aug 3, 2018
View reviewed changes
Copy link
Contributor

@jalvz jalvz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe have a look at the install docs, lgtm otherwise

@simitt
Copy link
Contributor Author

simitt commented Aug 3, 2018

good point! I just checked and did not find any dmg specific docs in the Installation section.

@simitt simitt mentioned this pull request Aug 3, 2018
Merged
@exekias exekias mentioned this pull request Aug 3, 2018
Merged
@simitt simitt requested a review from graphaelli August 3, 2018 13:38
graphaelli
graphaelli approved these changes Aug 4, 2018
View reviewed changes
Copy link
Member

@graphaelli graphaelli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@jalvz jalvz merged commit 27acff4 into elastic:master Aug 6, 2018
@simitt simitt deleted the fix-packaging branch August 21, 2018 12:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@graphaelli graphaelli graphaelli approved these changes

@jalvz jalvz jalvz approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@simitt @graphaelli @jalvz