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 dirty git state #6911

Merged
merged 1 commit into from Mar 28, 2017
Merged

Fix dirty git state #6911

merged 1 commit into from Mar 28, 2017

Conversation

clekstro
Copy link
Contributor

This fixes #6909. Inside of the afterInstall hook, we were using the async methods of fs-extra (.remove()) but not actually waiting for them to resolve. Instead, we use the sync variant to resolve the issue, as this ensures the file has been removed before we proceed.

@Turbo87
Copy link
Member

Turbo87 commented Mar 27, 2017

looks like this was caused by myself in #5797

homu added a commit that referenced this pull request Mar 28, 2017
Stop creating recursive symlink (addon requiring itself)

When running the `addon/smoke-test-slow` test in isolation, I was getting an `EEXIST` error that the `node_modules/developing-addon` symlink that we were creating manually in this test is already present. Deleting the extra test setup resolved the issue.

This just impacts the test suite and was a precursor to #6911.

Many thanks to @Turbo87 for helping to track this down ❤️
@Turbo87
Copy link
Member

Turbo87 commented Mar 28, 2017

@homu r+

@homu
Copy link
Contributor

homu commented Mar 28, 2017

📌 Commit 2ac2ce0 has been approved by Turbo87

@homu
Copy link
Contributor

homu commented Mar 28, 2017

⌛ Testing commit 2ac2ce0 with merge 3cd7674...

homu added a commit that referenced this pull request Mar 28, 2017
Fix dirty git state

This fixes #6909. Inside of the `afterInstall` hook, we were using the async methods of fs-extra (`.remove()`) but not actually waiting for them to resolve. Instead, we use the sync variant to resolve the issue, as this ensures the file has been removed before we proceed.
@homu
Copy link
Contributor

homu commented Mar 28, 2017

☀️ Test successful - status

@homu homu merged commit 2ac2ce0 into ember-cli:master Mar 28, 2017
homu added a commit that referenced this pull request Apr 1, 2017
Backport fixes to release branch

#6912, #6911, #6910 and #6919
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Git status dirty after running test suite
3 participants