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

chore: Add SPDX headers and REUSE CI workflow #5650

Merged
merged 4 commits into from
Jun 13, 2024
Merged

Conversation

susnux
Copy link
Contributor

@susnux susnux commented May 28, 2024

* ⚠️ this is chained on #5647

☑️ Resolves

Add SPDX headers to all files

🏁 Checklist

  • ⛑️ Tests are included or are not applicable
  • 📘 Component documentation has been extended, updated or is not applicable
  • 3️⃣ Backport to next requested with a Vue 3 upgrade

@susnux susnux added the 3. to review Waiting for reviews label May 28, 2024
@susnux susnux force-pushed the chore/update-ci branch from 076e7de to dafe136 Compare May 28, 2024 17:57
Base automatically changed from chore/update-ci to master May 28, 2024 18:04
@AndyScherzinger
Copy link
Contributor

@susnux many files lack the year for the copyright text line. The simplest is to add the year of the first commit for each file.

@AndyScherzinger
Copy link
Contributor

The year isn't mandatory but strongly suggested I would say.

README.md Outdated Show resolved Hide resolved
.reuse/dep5 Outdated Show resolved Hide resolved
Copy link
Contributor

@AndyScherzinger AndyScherzinger left a comment

Choose a reason for hiding this comment

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

Fine by me to merge, still some files missing the year info, which is fine I guess, any header is better than none 👍

.reuse/dep5 Outdated Show resolved Hide resolved
.reuse/dep5 Outdated Show resolved Hide resolved
@AndyScherzinger
Copy link
Contributor

@ShGKme fine to merge? Changes needed? :)

@AndyScherzinger
Copy link
Contributor

/backport to next

@AndyScherzinger AndyScherzinger added this to the 8.13.0 milestone Jun 12, 2024
Copy link
Contributor

@ShGKme ShGKme left a comment

Choose a reason for hiding this comment

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

There are still globs in reuse with glob extension (see comment above). I was told by @nickvergessen that this is not good as may potentially take more files than needed.

Other than that looks fine. Checked with https://github.com/nextcloud/github_helper/tree/master/spdx-convertor adjusted to this repo.

@AndyScherzinger
Copy link
Contributor

@ShGKme you mean #5650 (comment) as in the wildcards are to wide?

@AndyScherzinger
Copy link
Contributor

@susnux I'll take care of fixing the images and licenses in reuse 👍

@ShGKme
Copy link
Contributor

ShGKme commented Jun 13, 2024

@ShGKme you mean #5650 (comment) as in the wildcards are to wide?

Yes, but I haven't found Joas's comment about it in Talk Desktop's PR, may be It was in my dream.

confirming with Joas

Copy link
Contributor

@ShGKme ShGKme left a comment

Choose a reason for hiding this comment

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

No, this is not correct with this glob, same as it was on server.
Some files are not from Nextcloud, see:
https://github.com/nextcloud/server/blob/59c181b4cbc47821d0a7d35df747a8b1d012dfc7/.reuse/dep5#L158-L160

We should copy this block from server (and somehow maintain it 🥲)

@AndyScherzinger
Copy link
Contributor

No, this is not correct with this glob, same as it was on server.

Ah, yes. That I will fix myself on this PR since I also did that on server including replacing the icon for Material Symbol ones 👍

Thanks for the feedback @ShGKme - now it is clear to me what needs to be done 👍

susnux and others added 4 commits June 13, 2024 10:35
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
…tion

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
@AndyScherzinger
Copy link
Contributor

@ShGKme see b56a8b5 for replaced icons and license info 👍

@AndyScherzinger AndyScherzinger requested a review from ShGKme June 13, 2024 09:50
@AndyScherzinger AndyScherzinger merged commit c41253f into master Jun 13, 2024
19 checks passed
@AndyScherzinger AndyScherzinger deleted the fix/spdx branch June 13, 2024 10:03
Copy link

backportbot bot commented Jun 13, 2024

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

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

# Create the new backport branch
git checkout -b backport/5650/next

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 73ea7253 d451d1bd f33d8db9 b56a8b5b

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

Error: No changes found in backport branch


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

@AndyScherzinger
Copy link
Contributor

@susnux could you maybe take care of the forward porting to next? No hurries/rush

@susnux
Copy link
Contributor Author

susnux commented Jun 13, 2024

@AndyScherzinger yes

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

Successfully merging this pull request may close these issues.

3 participants