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 test 4270 #4402

Merged
merged 8 commits into from Nov 19, 2018

Conversation

Projects
None yet
2 participants
@qrilka
Copy link
Contributor

commented Nov 16, 2018

Please include the following checklist in your PR:

  • Any changes that could be relevant to users have been recorded in the ChangeLog.md
  • The documentation has been updated, if necessary.

This is a fix for a test 4270-files-order, the main point of it is in af36e04 other commits improve Stack integration tests a bit.
Integration tests succeed locally.

@snoyberg
Copy link
Contributor

left a comment

Can you also include a changelog entry explaining the bug fix this is accomplishing?

Show resolved Hide resolved src/Stack/Package.hs Outdated

@qrilka qrilka force-pushed the fix-test-4270 branch from 7117686 to 1ea6bc5 Nov 19, 2018

@qrilka

This comment has been minimized.

Copy link
Contributor Author

commented Nov 19, 2018

Fixed, added changelog

@@ -97,6 +97,8 @@ Bug fixes:
[#4314](https://github.com/commercialhaskell/stack/pull/4314)
* Add `--cabal-files` flag to `stack ide targets` command.
* Don't download ghc when using `stack clean`.
* Support loading in GHCi definitions from symlinked C files. See

This comment has been minimized.

Copy link
@snoyberg

snoyberg Nov 19, 2018

Contributor
Suggested change
* Support loading in GHCi definitions from symlinked C files. See
* Support loading in GHCi definitions from symlinked C files. Without this patch, Stack will try to find object files in the directory pointed to by symlinks, while GCC will produce the object files in the original directory. See
return $ if exists then [p] else []
resolveCandidate dir = fmap maybeToList . resolveDirFile dir

resolveDirFile

This comment has been minimized.

Copy link
@snoyberg

snoyberg Nov 19, 2018

Contributor

Please add a comment explaining that symlinks will not be followed.

@qrilka

This comment has been minimized.

Copy link
Contributor Author

commented Nov 19, 2018

Anything else here?

@snoyberg

This comment has been minimized.

Copy link
Contributor

commented Nov 19, 2018

Good to merge after CI runs

@snoyberg snoyberg merged commit 042d4c1 into master Nov 19, 2018

2 of 5 checks passed

continuous-integration/travis-ci/push The Travis CI build could not complete due to an error
Details
continuous-integration/appveyor/branch AppVeyor build failed
Details
continuous-integration/appveyor/pr AppVeyor build failed
Details
ci/gitlab/fix-test-4270 Pipeline skipped on GitLab
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@snoyberg snoyberg deleted the fix-test-4270 branch Nov 19, 2018

@qrilka qrilka referenced this pull request Nov 20, 2018

Merged

Use default resolver for test 4101-dependency-tree #4407

0 of 2 tasks complete
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.