Skip to content
This repository has been archived by the owner on Apr 1, 2022. It is now read-only.

Fix archive compression bug #373

Merged
merged 4 commits into from
Sep 17, 2021
Merged

Fix archive compression bug #373

merged 4 commits into from
Sep 17, 2021

Conversation

jssblck
Copy link
Member

@jssblck jssblck commented Sep 17, 2021

Overview

Fix a bug when using vendored-dependencies in fossa-deps.yml, where the vendored project was in a subdirectory.

Acceptance criteria

Support vendored projects in subdirectories.

Testing plan

  1. I created a project with vendored dependencies and a fossa-deps.yml file. View it at go/cpp-vsi-demo on the branch with-fossa-deps.
  2. I ran a scan against that project and confirmed that everything now works as expected.

Risks

None that I can think of in particular.

Checklist

  • I added tests for this PR's change (or confirmed tests are not viable).
  • I updated Changelog.md if this change is externally facing. If this PR did not mark a release, I added my changes into an # Unreleased section at the top.

@jssblck jssblck requested review from a team and spatten and removed request for a team September 17, 2021 00:11
Copy link
Contributor

@skilly-lily skilly-lily left a comment

Choose a reason for hiding this comment

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

Looks good to me, code-wise. Haven't tested, but I'd probably defer to you for testing here, since you found the issue.

One unrelated nit.

@@ -98,7 +99,7 @@ compressFile :: Path Abs Dir -> Path Abs Dir -> FilePath -> IO FilePath
compressFile outputDir directory fileToTar = do
-- Without using `fromAbsDir` for each of these directories, the conversion
-- is incorrect. `show outputDir` gives an incorrect result even though it typechecks.
let finalFile = toString outputDir </> fileToTar
let finalFile = toString outputDir </> safeSeparators fileToTar
Copy link
Contributor

Choose a reason for hiding this comment

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

[nit]: Can we remove the above comment while we're here? It was stale when we switched to using toString

@jssblck jssblck merged commit 45f6917 into master Sep 17, 2021
@jssblck jssblck deleted the bugfix-withTempDir branch September 17, 2021 17:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants