This repository has been archived by the owner on Apr 1, 2022. It is now read-only.
Split inferProject into inferProjectFromVCS + inferProjectDefault + saveRevision; add inferProjectCached #188
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
…aveRevision; add inferProjectCached
cnr
commented
Feb 3, 2021
| @@ -194,7 +195,8 @@ analyze basedir destination override unpackArchives filters = do | |||
| FoundSome someProjects -> case destination of | |||
| OutputStdout -> logStdout . pretty . decodeUtf8 . Aeson.encode . buildResult $ NE.toList someProjects | |||
| UploadScan apiOpts metadata -> do | |||
| revision <- mergeOverride override <$> inferProject (unBaseDir basedir) | |||
| revision <- mergeOverride override <$> (inferProjectFromVCS basedir <||> inferProjectDefault basedir) | |||
| saveRevision revision | |||
There was a problem hiding this comment.
The trick is that we use (inferProjectFromVCS basedir <||> inferProjectDefault basedir) followed by a saveRevision in places where we do analysis, and (inferProjectFromVCS basedir <||> inferProjectCached basedir <||> inferProjectDefault basedir) elsewhere
cnr
force-pushed
the
cached-inference-fix
branch
from
009749e to
402baa4
Compare
skilly-lily
approved these changes
Feb 3, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 a bug where a missing
.fossa.revisionfile would prevent a successful analysis, and correctly overlays "override" information from the CLI argsFixes fossas/issues#353