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(build): without non deterministic vendor-LICENSE.txt #6539

Merged
merged 1 commit into from
Dec 13, 2024

Conversation

max-nextcloud
Copy link
Collaborator

@max-nextcloud max-nextcloud commented Oct 17, 2024

The content of vendor.LICENSE.txt is not deterministic.

If two versions of one library are imported
one of them will be picked and listed in the file.

This results in arbitrary changes to the file
which in turn create npm fix audit PRs such as #6534.

See also: https://nextcloud-libraries.github.io/nextcloud-vite-config/interfaces/BaseOptions.html#thirdPartyLicense

@juliusknorr
Copy link
Member

I think we added that on purpose for compliance reasons, but I'm unsure what the current state there is.

activity for example also has this disabled and a separate flag but commented out: https://github.com/nextcloud/activity/blame/master/vite.config.ts#L16-L18

@susnux Any hint there? Is this fine to turn off for now?

@susnux
Copy link
Contributor

susnux commented Oct 17, 2024

It is ok to do so, but instead enabled extractLicenseInformation to keep us compliant.

@juliusknorr
Copy link
Member

@max-nextcloud Can you adjust that?

Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

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

Needs changes

@max-nextcloud max-nextcloud force-pushed the fix/no-vendor-license-file branch from 4c9641b to 54794f0 Compare December 10, 2024 07:43
@max-nextcloud max-nextcloud force-pushed the fix/no-vendor-license-file branch from 54794f0 to 76c8993 Compare December 10, 2024 07:44
@max-nextcloud
Copy link
Collaborator Author

@max-nextcloud Can you adjust that?

Done. Added extractLicenseInformation: true.

@max-nextcloud max-nextcloud force-pushed the fix/no-vendor-license-file branch from 76c8993 to 0579a12 Compare December 10, 2024 14:34
Copy link

codecov bot commented Dec 13, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 47.56%. Comparing base (58d0626) to head (2eea6a2).
Report is 25 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6539      +/-   ##
==========================================
+ Coverage   46.26%   47.56%   +1.29%     
==========================================
  Files         746      284     -462     
  Lines       34452    33515     -937     
  Branches     1239      777     -462     
==========================================
  Hits        15940    15940              
+ Misses      17892    17417     -475     
+ Partials      620      158     -462     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@max-nextcloud max-nextcloud merged commit 367fbfd into main Dec 13, 2024
64 checks passed
@max-nextcloud max-nextcloud deleted the fix/no-vendor-license-file branch December 13, 2024 07:36
@juliusknorr
Copy link
Member

@max-nextcloud I think this broke reuse compliance, can you check that? Seems it only happend on main as the committed assets were only updated there.

@max-nextcloud
Copy link
Collaborator Author

@juliusknorr ahh... I was wondering what broke it. I'll take a look

@max-nextcloud
Copy link
Collaborator Author

/backport to stable30

Copy link

backportbot bot commented Dec 16, 2024

The backport to stable30 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable30
git pull origin stable30

# Create the new backport branch
git checkout -b backport/6539/stable30

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 2eea6a29

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6539/stable30

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants