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.

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

Include HotROD binary in the distributions #917

Merged
merged 6 commits into from Jul 8, 2018
Merged

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Jul 8, 2018

Along with #915 this allows running the whole HotROD demo without recompiling the service, and without Docker.

Also, replaces go-bindata with rakyl/statik, which is simpler to use.

@codecov
Copy link

codecov bot commented Jul 8, 2018

Codecov Report

Merging #917 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@          Coverage Diff          @@
##           master   #917   +/-   ##
=====================================
  Coverage     100%   100%           
=====================================
  Files         126    126           
  Lines        6071   6071           
=====================================
  Hits         6071   6071

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e8cf3d1...a5a8e57. Read the comment docs.

Makefile Outdated
@@ -208,15 +207,15 @@ docker: build_ui docker-no-ui

.PHONY: build-binaries-linux
build-binaries-linux:
GOOS=linux $(MAKE) build-agent build-collector build-query build-all-in-one
GOOS=linux $(MAKE) build-agent build-collector build-query build-all-in-one build-examples
Copy link
Collaborator

Choose a reason for hiding this comment

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

can these commands be DRY'd? looks like the only different is the GOOS

Yuri Shkuro added 6 commits July 8, 2018 18:13
Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
Signed-off-by: Yuri Shkuro <ys@uber.com>
@yurishkuro yurishkuro merged commit 8a75233 into master Jul 8, 2018
@ghost ghost removed the review label Jul 8, 2018
@yurishkuro yurishkuro deleted the hotrod-binary branch July 8, 2018 22:39

.PHONE: docker-hotrod
docker-hotrod: build-examples
docker-hotrod:
GOOS=linux $(MAKE) build-examples
Copy link
Contributor

Choose a reason for hiding this comment

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

This sounds a bit odd. What was wrong with the previous approach?

Copy link
Member Author

Choose a reason for hiding this comment

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

previously build-examples target didn't work for multiple architectures. Now it is in line with other build-{binary} targets.

Copy link
Contributor

Choose a reason for hiding this comment

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

I see. And because it's Docker, GOOS=linux is appropriate. Makes sense, thanks for the explanation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants