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

Fix Windows build errors #1704

Merged
merged 2 commits into from Apr 29, 2019

Conversation

Projects
3 participants
@jmjatlanta
Copy link
Contributor

commented Apr 5, 2019

Fixes #1593

With these changes (and the ones already merged to bitshares-fc:master), bitshares-core now builds on Windows 10.

@pmconrad

This comment has been minimized.

Copy link
Contributor

commented Apr 6, 2019

Was fc already bumped to include these changes in develop branch? If not please do so.

@pmconrad

This comment has been minimized.

Copy link
Contributor

commented Apr 8, 2019

The fc version doesn't exist, please double-check and force-push

@jmjatlanta jmjatlanta force-pushed the jmj_1593 branch 2 times, most recently from aa9dc1c to 283515d Apr 8, 2019

@abitmore abitmore added this to the 3.1.0 - Feature Release milestone Apr 8, 2019

@abitmore abitmore added this to In development in Feature Release (3.1.0) via automation Apr 8, 2019

@pmconrad

This comment has been minimized.

Copy link
Contributor

commented Apr 10, 2019

Sorry, but you have to rebase on latest develop to avoid the conflict.

jmjatlanta added some commits Apr 5, 2019

@jmjatlanta jmjatlanta force-pushed the jmj_1593 branch from 283515d to 5aaee56 Apr 11, 2019

@jmjatlanta

This comment has been minimized.

Copy link
Contributor Author

commented Apr 11, 2019

Sorry, but you have to rebase on latest develop to avoid the conflict.

Rebased, conflict resolved. Thanks.

@pmconrad

This comment has been minimized.

Copy link
Contributor

commented Apr 29, 2019

Looks good, but can't test windows build. Travis + docker are ok, so who cares? ;-)

@jmjatlanta jmjatlanta merged commit e710483 into develop Apr 29, 2019

3 checks passed

ci/dockercloud Your tests passed in Docker Cloud
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

Feature Release (3.1.0) automation moved this from In development to Done Apr 29, 2019

@abitmore abitmore deleted the jmj_1593 branch Jun 16, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.