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

R4R: Makefile OS compatibility update #2709

Merged
merged 6 commits into from
Nov 12, 2018
Merged

Conversation

greg-szabo
Copy link
Member

  • Targeted PR against develop branch

  • Linked to github-issue with discussion and accepted design OR link to spec that describes this work. Makefile stabilization and updates #2672

  • Wrote tests - Ran tests on Windows and OSX

  • [] Updated relevant documentation (docs/) (No feature change.)

  • Added entries in PENDING.md with issue #

  • rereviewed Files changed in the github PR explorer

Required for Voyager binary signing on Windows.


For Admin Use:

  • Added appropriate labels to PR (ex. wip, ready-for-review, docs)
  • Reviewers Assigned
  • Squashed all commits, uses message "Merge pull request #XYZ: [title]" (coding standards)

@codecov
Copy link

codecov bot commented Nov 7, 2018

Codecov Report

Merging #2709 into develop will decrease coverage by 0.02%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop    #2709      +/-   ##
===========================================
- Coverage    56.69%   56.67%   -0.03%     
===========================================
  Files          156      156              
  Lines         9790     9790              
===========================================
- Hits          5550     5548       -2     
- Misses        3862     3864       +2     
  Partials       378      378

Copy link
Contributor

@melekes melekes left a comment

Choose a reason for hiding this comment

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

🍇

Makefile Show resolved Hide resolved
Makefile Outdated
@@ -20,23 +18,31 @@ ci: get_tools get_vendor_deps install test_cover test_lint test
########################################
### Build/Install

check-ledger:
# Add ledger support - Makefile variable changes are out of a target's scope. There is no point in putting this into a target.
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this a TODO? Im confused?

Copy link
Member Author

@greg-szabo greg-szabo Nov 7, 2018

Choose a reason for hiding this comment

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

Nope, it's a comment. We can remove it. The point is that checking the ledger support is not a target, it's a Makefile variable set - which is not a scope of a target. Everything below the comment adds ledger support, when it's available for build.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, then I don't think we need the comment then 👍

@greg-szabo
Copy link
Member Author

Guys, we need to move faster with this. The above changes were only a warmup. The ones coming today require deep knowledge of Makefile creation. Do you want me to set up a knowledge share?

@greg-szabo
Copy link
Member Author

The good news is that the latest changes are actively used by CircleCI in the setup_dependencies stage. (That it succeeded, is a good sign.) The code was tested on OSX and Windows and now CircleCI ran it on Linux, so (apart from BSD) it cross-compiles properly. Changing the tool version is as easy as going to the bottom of the Makefile and changing the commit id.

@cwgoes
Copy link
Contributor

cwgoes commented Nov 8, 2018

@greg-szabo Is this R4R or do you want to make more changes?

@greg-szabo
Copy link
Member Author

It's ready for review. The first one was a valid change on its own. The second one is dependent on the first one.

@cwgoes cwgoes added ready-for-review tooling dev tooling within the sdk labels Nov 8, 2018
@cwgoes cwgoes changed the title Makefile OS compatibility update R4R: Makefile OS compatibility update Nov 8, 2018
Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

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

testedACK -- just remove the aforementioned comment about the ledger target.

Makefile Outdated
@@ -20,23 +18,31 @@ ci: get_tools get_vendor_deps install test_cover test_lint test
########################################
### Build/Install

check-ledger:
# Add ledger support - Makefile variable changes are out of a target's scope. There is no point in putting this into a target.
Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, then I don't think we need the comment then 👍

Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

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

Thanks @greg-szabo !

Copy link
Contributor

@cwgoes cwgoes left a comment

Choose a reason for hiding this comment

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

Tested ACK, thanks @greg-szabo 🐚

@greg-szabo
Copy link
Member Author

What's holding back this change?

@alexanderbez
Copy link
Contributor

Nothing afaik (except fixing the pending log conflict).

@jackzampolin jackzampolin merged commit fd7175d into develop Nov 12, 2018
@jackzampolin jackzampolin deleted the greg/MakefileFix2672 branch November 12, 2018 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tooling dev tooling within the sdk
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants