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: more windows interop #147

Merged
merged 7 commits into from
Nov 6, 2017
Merged

fix: more windows interop #147

merged 7 commits into from
Nov 6, 2017

Conversation

richardschneider
Copy link
Contributor

No description provided.

@ghost ghost assigned richardschneider Nov 6, 2017
@ghost ghost added the status/in-progress In progress label Nov 6, 2017
@codecov
Copy link

codecov bot commented Nov 6, 2017

Codecov Report

❗ No coverage uploaded for pull request base (master@3a44e56). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #147   +/-   ##
=========================================
  Coverage          ?   84.01%           
=========================================
  Files             ?        9           
  Lines             ?      269           
  Branches          ?        0           
=========================================
  Hits              ?      226           
  Misses            ?       43           
  Partials          ?        0

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 3a44e56...d0a2ae7. Read the comment docs.

package.json Outdated
"datastore-core": "~0.4.0",
"datastore-fs": "~0.4.0",
"datastore-level": "~0.6.0",
"datastore-level": "github:ipfs/js-datastore-level#windows-interop",
Copy link
Member

Choose a reason for hiding this comment

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

Change to use the actual version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@diasdavid was not ready for a review yet. One the travis CI builds keeps on timing out.

Copy link
Member

Choose a reason for hiding this comment

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

Roger!

@@ -48,6 +48,7 @@
"lodash": "^4.17.4",
"memdown": "^1.4.1",
"multihashes": "~0.4.12",
"multihashing-async": "^0.4.7",
Copy link
Member

Choose a reason for hiding this comment

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

Was this dep necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, test/blockstore-test requires it. Its a devDependency

package.json Outdated
"test:browser": "aegir test --target browser",
"test": "aegir test --timeout 10000",
"test:node": "aegir test --target node --timeout 10000",
"test:browser": "aegir test --target browser --timeout 10000",
Copy link
Member

Choose a reason for hiding this comment

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

Avoid global timeouts

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok, will use .timeout on the bad test

@ghost ghost assigned daviddias Nov 6, 2017
@daviddias
Copy link
Member

Resolved the conflict with Master (package.json)

@richardschneider
Copy link
Contributor Author

@diasdavid seems that appveyor has placed us in queue; I've been waiting 30 mins. If it ever completes, could you review and release. I going off-line soon.

@daviddias daviddias merged commit 22590cb into master Nov 6, 2017
@daviddias daviddias deleted the win-interop branch November 6, 2017 09:12
@ghost ghost removed the status/in-progress In progress label Nov 6, 2017
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.

2 participants