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

Bug: fix windows curl #126

Merged
merged 9 commits into from Sep 30, 2019

Conversation

ciband
Copy link
Contributor

@ciband ciband commented Sep 10, 2019

Added additional flags to explicitly set linking with static CRT as well as producing and linking with static libraries.

Fixes #123

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Refactor
  • Performance
  • Tests
  • Build
  • Documentation
  • Code style update
  • Continuous Integration
  • Other, please describe:

Does this PR introduce a breaking change?

  • Yes
  • No

Does this PR release a new version?

  • Yes
  • No

If yes, please describe the impact and migration path for existing applications:

The PR fulfills these requirements:

  • It's submitted to the develop branch, not the master branch
  • All tests are passing
  • New/updated tests are included

If adding a new feature, the PR's description includes:

  • A convincing reason for adding this feature (to avoid wasting your time, it's best to open a suggestion issue first and wait for approval before working on it)

Added additional flags to explicitly set linking with static CRT as well as producing and linking wtih static libraries.
@ghost
Copy link

ghost commented Sep 10, 2019

Thanks for submitting this pull request! A maintainer will review this in the next few days and explicitly select labels so you know what's going on.

If no reviewer appears after a week, a reminder will be sent out.

@ghost
Copy link

ghost commented Sep 10, 2019

Your pull request doesn't follow our contribution guidelines. Please review and correct it.

@ghost ghost added the Complexity: Low Less than 64 lines changed. label Sep 10, 2019
@sleepdefic1t
Copy link
Contributor

@ciband

I got this to build and passed tests on my system (macOS) with a few tweaks.

I changed a couple parts and ran brew install openssl.
(changes in PR comments; the brew bit just add to config.yml).

Thank you for working on this.
Much appreciated, sir!

@ciband
Copy link
Contributor Author

ciband commented Sep 11, 2019

Do thoses changes force the apple builds to use an installed version of openssl instead of our internally build version?

Is that desirable vs. all platforms running the same thing?

@sleepdefic1t
Copy link
Contributor

@ciband
It totally does use an installed version.

Yeah, it'd be preferred to have all builds do the same thing.

If you have anything you'd like me to try, just let me know 👍

@ciband
Copy link
Contributor Author

ciband commented Sep 12, 2019

@sleepdefic1t Your changes are correct. I got curl and openssl twisted in my head. Just pushed them.

@ciband
Copy link
Contributor Author

ciband commented Sep 12, 2019

Not sure why AppVeyor failed. The release build passed but the debug build did not.

Logs show that the build was successful but some error occurred before tests could be built/ran. This seems like a CI issue to me.

@faustbrian can you rerun just the debug build to test? I do not have access.

Thanks.

@sleepdefic1t
Copy link
Contributor

@faustbrian
Can you retrigger Appveyor when you get a moment, please and thank you.

@faustbrian
Copy link
Contributor

@ciband conflicts

@faustbrian
Copy link
Contributor

@ciband
Copy link
Contributor Author

ciband commented Sep 23, 2019

@faustbrian same issue here as in cpp-crypto. I fixed the conflict and merged develop into the PR. When I go to push I get an error. Will investigate later.

@codecov
Copy link

codecov bot commented Sep 26, 2019

Codecov Report

Merging #126 into develop will increase coverage by 20.52%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           develop   #126       +/-   ##
==========================================
+ Coverage    79.47%   100%   +20.52%     
==========================================
  Files           26     16       -10     
  Lines          497    376      -121     
==========================================
- Hits           395    376       -19     
+ Misses         102      0      -102
Impacted Files Coverage Δ
src/api/blocks/blocks.cpp
src/include/cpp-client/api/rounds/rounds.h
src/api/votes/votes.cpp
src/api/node/node.cpp
src/api/delegates/delegates.cpp
src/api/rounds/rounds.cpp
src/api/wallets/wallets.cpp
src/api/transactions/transactions.cpp
src/api/peers/peers.cpp
src/api/blockchain/blockchain.cpp
... and 9 more

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 5ba9d18...1100c6d. Read the comment docs.

@ghost
Copy link

ghost commented Sep 26, 2019

A contributor has approved this PR. A maintainer will merge this PR shortly. If it shouldn't be merged yet, please leave a comment saying so and we'll wait.

Thank you for your contribution!

@ghost ghost added the Status: Contributor Approved The pull request has been approved by a contributor. label Sep 26, 2019
@sleepdefic1t sleepdefic1t mentioned this pull request Sep 27, 2019
3 tasks
@sleepdefic1t
Copy link
Contributor

@ciband
#132 May help kick start CI Actions after it's merged and pulled in.

If not, you may have to redo the PR from a fresh fork.
Hopefully we can avoid that though 👍

@ciband
Copy link
Contributor Author

ciband commented Sep 29, 2019

Looks like the same Appveyor issues. With the changes the code builds, which was the main problem. CI will be fixed in a github windows ci commit.

@sleepdefic1t sleepdefic1t merged commit 685aa07 into ArkEcosystemArchive:develop Sep 30, 2019
@ghost
Copy link

ghost commented Sep 30, 2019

Your pull request has been merged but was not assigned a bounty tier. A maintainer will assign a bounty tier to this pull request in the next few days.

@faustbrian faustbrian added Bounty: Tier 4 Awarded for small features, refactorings, improvements. This is valued at 20 USD. and removed Bounty: Tier 4 Awarded for small features, refactorings, improvements. This is valued at 20 USD. labels Oct 1, 2019
@ghost
Copy link

ghost commented Oct 1, 2019

Your pull request has been merged and marked as tier 4. It will earn you $20 USD.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bounty: Tier 4 Awarded for small features, refactorings, improvements. This is valued at 20 USD. Complexity: Low Less than 64 lines changed. Status: Contributor Approved The pull request has been approved by a contributor.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants