Avoid including daml-stdlib and daml-prim twice #4222
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes #4114 and cleans up the situation around `data-dependencies` and `dependencies` as described in #4218. There is still more work to be done here mostly around ironing out all the edge cases and producing useful error messages instead of silentely doing the wrong thing but I’ll leave that to a separate PR. To test this, I’ve fixed the packaging tests to no longer deduplicate package ids (which means they would return the wrong number if daml-prim ends up in there twice) and I addded a test where we have 3 projects: - `lib` - `a` which depends on `lib` - `b` which depends on `lib` via `dependencies` and 'a' via `data-dependencies`. changelog_begin changelog_end
cocreature
commented
Jan 27, 2020
| ] | ||
| writeFileUTF8 (tmpDir </> "lib" </> "Lib.daml") $ unlines | ||
| [ "daml 1.2 module Lib where" | ||
| , "inc : Int -> Int" |
There was a problem hiding this comment.
If you think left-pad was the most useless library, think again!
ghost
approved these changes
Jan 27, 2020
| @@ -40,7 +42,7 @@ import SdkVersion | |||
| data Env = Env | |||
| { envPkgs :: MS.Map UnitId LF.Package | |||
| , envGetUnitId :: LF.PackageRef -> UnitId | |||
| , envStablePackages :: MS.Map LF.PackageId (UnitId, LF.ModuleName) | |||
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #4114 and cleans up the situation around
data-dependenciesanddependenciesas described in #4218.There is still more work to be done here mostly around ironing out all
the edge cases and producing useful error messages instead of
silentely doing the wrong thing but I’ll leave that to a separate PR.
To test this, I’ve fixed the packaging tests to no longer deduplicate
package ids (which means they would return the wrong number if
daml-prim ends up in there twice) and I addded a test where we have 3
projects:
libawhich depends onlibbwhich depends onlibviadependenciesand 'a' viadata-dependencies.changelog_begin
changelog_end
Pull Request Checklist
CHANGELOG_BEGINandCHANGELOG_ENDtagsNOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with
/AzurePipelines runtotrigger the build.