canary
/
canary-rs
2
1
Fork 0
Code Issues 11 Pull Requests 2 Projects Releases Wiki Activity

Check for license information parity #36

Merged
mars merged 9 commits from :main into main 2022-11-17 06:30:36 +00:00
Conversation 1 Commits 9 Files Changed 1 +36 -2
emma commented 2022-11-12 05:02:37 +00:00
Contributor
Copy Link
No description provided.
emma added 2 commits 2022-11-12 05:02:37 +00:00
emma added 1 commit 2022-11-12 06:23:19 +00:00
emma added 1 commit 2022-11-12 06:29:51 +00:00
emma added 1 commit 2022-11-12 08:12:06 +00:00
emma changed title from Add dependency check for check_licenses.sh to Add fallback if rg(1) is not in the $PATH 2022-11-12 08:12:51 +00:00
emma added 1 commit 2022-11-12 08:18:31 +00:00
mars requested changes 2022-11-16 04:00:58 +00:00
mars left a comment
Owner
Copy Link

Looks great, thanks.

Looks great, thanks.
check_licenses.sh Outdated
@ -5,0 +10,4 @@
# check if we have rg(1); if not, use find(1) and sed(1) instead
if ! command -v rg >/dev/null 2>&1; then
files="$(find "$PWD" -name "$1")"
mars commented 2022-11-16 03:59:33 +00:00
Owner
Copy Link

This includes false positive generated Rust source files (i.e. from the wayland-protocols crate) in the target/ directory, so target/ needs to be excluded from the search path.

This includes false positive generated Rust source files (i.e. from the wayland-protocols crate) in the `target/` directory, so `target/` needs to be excluded from the search path.
emma marked this conversation as resolved
check_licenses.sh Outdated
@ -5,0 +13,4 @@
files="$(find "$PWD" -name "$1")"
for file in $files; do
if ! test -n \
"$(sed -n '\|// SPDX-License-Identifier: .*|p' <"$file")"
mars commented 2022-11-16 03:55:18 +00:00
Owner
Copy Link

You need to test for the // Copyright (c) 2022 Marceline Cramer copyright holder line at the beginning too.

You need to test for the `// Copyright (c) 2022 Marceline Cramer` copyright holder line at the beginning too.
emma marked this conversation as resolved
check_licenses.sh Outdated
@ -5,0 +19,4 @@
fi
done
else
rg --multiline --files-without-match --glob "$1" --pcre2 \
mars commented 2022-11-16 03:53:16 +00:00
Owner
Copy Link

If you hate ripgrep this much you can go ahead and ditch support for it if you want.

If you hate ripgrep this much you can go ahead and ditch support for it if you want.
emma marked this conversation as resolved
emma added 1 commit 2022-11-16 05:51:07 +00:00
emma added 1 commit 2022-11-16 06:25:35 +00:00
emma changed title from Add fallback if rg(1) is not in the $PATH to Check for license information parity 2022-11-16 06:26:12 +00:00
mars commented 2022-11-17 06:30:25 +00:00
Owner
Copy Link

This looks great, thank you very much. :)

This looks great, thank you very much. :)
mars added 1 commit 2022-11-17 06:30:29 +00:00
mars merged commit 7de22f9bd4 into main 2022-11-17 06:30:36 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
mars
Labels
Clear labels   
abi change

Breaking ABI change between scripts and host.

  
api change

Changes the interfaces between crates.

  
bug

Unintended behavior.

  
cleanup

Code maintenance, QOL improvements, and refactors.

  
consistency

Keeps all components in sync.

  
feature

To do with new features.

  
performance

Performance improvements.

  
updates docs

Requires a change to the documentation.

No Label
abi change
api change
bug
cleanup
consistency
feature
performance
updates docs
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: canary/canary-rs#36
No description provided.
Delete Branch ":main"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?