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.

Sign up for GitHub

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

Jump to bottom

Fix license file matches #1434

Merged
merged 4 commits into from
May 28, 2024
Merged

Fix license file matches #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
181b4e3
Fix license scan bug
JeffreyHuynh1 May 24, 2024
3d60cb6
update changelog
JeffreyHuynh1 May 24, 2024
032e87d
Set archive uploads to include full files
JeffreyHuynh1 May 28, 2024
ddd3d1a
update changelog
JeffreyHuynh1 May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# FOSSA CLI Changelog

## 3.9.20
- Fixes file matches for license scans ([#1434](https://github.com/fossas/fossa-cli/pull/1434)).

## v3.9.19
- Release a Mac arm64 binary. ([#1426](https://github.com/fossas/fossa-cli/pull/1426))
- Updated the license to CPAL, an OSI-approved license similar to MPL ([#1431](https://github.com/fossas/fossa-cli/pull/1431)).
Expand Down
4 changes: 3 additions & 1 deletion src/Fossa/API/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,9 @@ instance ToJSON ArchiveComponents where
toJSON ArchiveComponents{..} =
object
[ "archives" .= archiveComponentsArchives
, "fullFiles" .= archiveComponentsUpload
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Based on the previous code: https://github.com/fossas/fossa-cli/pull/1423/files#diff-78dfaf45d3d47ee1eb7bc8a678e57e40022f78c8c394da5c9adb61582e3c63c4L154

I've changed the json value for archiveComponentsUpload to be set to a boolean.

, "fullFiles" .= case archiveComponentsUpload of
FileUploadFullContent -> True
FileUploadMatchData -> False
, -- Don't use the ToJSON instance of DependencyRebuild since this endpoint has a different expectation.
"forceRebuild" .= case archiveComponentsRebuild of
DependencyRebuildReuseCache -> False
Expand Down
Loading