-
Notifications
You must be signed in to change notification settings - Fork 302
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
DAOS-15677 cq: add copyright GHA #15552
Changes from 5 commits
585384d
4d45740
0f9db64
f7ea6bd
4112206
5609bf3
e8678b5
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,12 @@ | ||
/** | ||
* (C) Copyright 2018-2021 Lei Huang. | ||
* (C) Copyright 2023 Intel Corporation. | ||
* | ||
* SPDX-License-Identifier: BSD-2-Clause-Patent | ||
*/ | ||
|
||
|
||
/* dummy change */ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Notice if you view this file in the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Looks good. |
||
#ifndef __HOOK_INT | ||
#define __HOOK_INT | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
#!/bin/bash | ||
# | ||
# Copyright 2024 Intel Corporation. | ||
# | ||
# SPDX-License-Identifier: BSD-2-Clause-Patent | ||
# | ||
# Check or update copyright date in modified files. | ||
# Usage: check_update_copyright.sh <git_target> <githook|gha> | ||
# mode "githook" will update copyright dates in place. | ||
# mode "gha" will just print a warning in a GHA-compatible format. | ||
|
||
set -e | ||
|
||
git_target="$1" | ||
mode="$2" | ||
case "$mode" in | ||
"githook" | "gha") | ||
;; | ||
*) | ||
echo "Usage: check_update_copyright.sh <githook|gha>" | ||
exit 1 | ||
esac | ||
|
||
# Navigate to repo root | ||
PARENT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" | ||
cd "$PARENT_DIR"/../../ | ||
|
||
|
||
regex='(^[[:blank:]]*[\*/]*.*)((Copyright[[:blank:]]*)([0-9]{4})(-([0-9]{4}))?)([[:blank:]]*(Intel.*$))' | ||
year=$(date +%Y) | ||
errors=0 | ||
targets=( | ||
# Entries with wildcard. These must be first and start with '*' or | ||
# older versions of git will return files that were not changed. | ||
'*.c' | ||
'*.h' | ||
'*.go' | ||
'*.py' | ||
'*.proto' | ||
'*.java' | ||
'*.yml' | ||
'*.yaml' | ||
'*.sh' | ||
'*.bash' | ||
'*Dockerfile*' | ||
'*README*' | ||
'*LICENSE*' | ||
'*NOTICE*' | ||
'*.txt' | ||
'*.md' | ||
# Entries without a wildcard | ||
'Makefile' | ||
'Jenkinsfile' | ||
'SConscript' | ||
'SConstruct' | ||
'copyright' | ||
'.env' | ||
) | ||
|
||
if [ -z "$files" ]; then | ||
files=$(git diff "$git_target" --cached --diff-filter=AM --name-only -- "${targets[@]}") | ||
else | ||
echo " Checking against custom files" | ||
fi | ||
|
||
os=$(uname -s) | ||
|
||
. utils/githooks/git-version.sh | ||
|
||
for file in $files; do | ||
echo "DEBUG: Checking $file" | ||
if [[ "$file" == *vendor* ]] || [[ "$file" == *pb.go ]] || | ||
[[ "$file" == *_string.go ]] || [[ "$file" == *pb-c* ]] || | ||
{ [ "$mode" == "githook" ] && | ||
[ "$git_vercode" -ge 2030000 ] && | ||
[ "$(git diff --cached -I Copyright "$file")" = '' ]; }; then | ||
echo "DEBUG: Skipping $file" | ||
continue | ||
fi | ||
read -r y1 y2 <<< "$(sed -nre "s/^.*$regex.*$/\4 \6/p" "$file")" | ||
if [[ -z $y1 ]] ; then | ||
# Print warning but don't error on non-existent copyright | ||
echo " Copyright Information not found in: $file" | ||
Comment on lines
+79
to
+81
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's possible to propagate warnings to GHA but I'm not sure how many files would be flagged here |
||
elif [[ $y1 -ne $year && $year -ne $y2 ]] ; then | ||
if [[ "$mode" == "githook" ]]; then | ||
# Update copyright in place | ||
if ! git reset "$file"; then | ||
echo " Unable to un-stage $file" | ||
errors=$((errors + 1)) | ||
fi | ||
if [[ "$os" == 'Linux' ]]; then | ||
sed -i -re "s/$regex/\1Copyright $y1-$year \8/" "$file" | ||
else | ||
sed -i '' -re "s/$regex/\1Copyright $y1-$year \8/" "$file" | ||
fi | ||
|
||
if ! git add "$file"; then | ||
echo " Unable to re-stage $file" | ||
errors=$((errors + 1)) | ||
fi | ||
elif [[ "$mode" == "gha" ]]; then | ||
# Print error but do not update | ||
lineno="$(grep -nE "$regex" "$file" | cut -f1 -d:)" | ||
echo "::error file=$file,line=$lineno::Copyright out of date" | ||
errors=$((errors + 1)) | ||
fi | ||
fi | ||
done | ||
|
||
if [[ $errors -ne 0 ]]; then | ||
echo " $errors errors while checking/fixing copyrights." | ||
exit 1 | ||
fi |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
#!/bin/bash | ||
# | ||
# Copyright 2022-2024 Intel Corporation. | ||
# | ||
# SPDX-License-Identifier: BSD-2-Clause-Patent | ||
# | ||
# A git hook to validate and correct the copyright date in source files. | ||
|
||
_print_githook_header "Copyright" | ||
if [ -e .git/MERGE_HEAD ]; then | ||
echo "Merge commit. Skipping" | ||
exit 0 | ||
fi | ||
|
||
echo "Updating copyright headers" | ||
|
||
utils/cq/check_update_copyright.sh "$TARGET" githook |
Original file line number | Diff line number | Diff line change | ||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -25,6 +25,7 @@ CURL_VERBOSE=${CURL_VERBOSE:-""} | |||||||||||||||
CURL_PROXY="${CURL_PROXY:+-x }${CURL_PROXY:-}" | ||||||||||||||||
CURL_OPTS="$CURL_PROXY $CURL_VERBOSE -s" | ||||||||||||||||
URL="https://$HOST/pipeline-model-converter/validate" | ||||||||||||||||
# shellcheck disable=SC2086 | ||||||||||||||||
if ! output=$(curl $CURL_OPTS -s -X POST -F "jenkinsfile=<${1:-Jenkinsfile}" "$URL"); then | ||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. SC2086 is usually pretty easy to resolve:
Suggested change
Clearly I should have done that in the first place. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Actually, no. It doesn't like that either There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Pushed with more quotes |
||||||||||||||||
echo " Failed to access $URL. Skipping" | ||||||||||||||||
exit 0 | ||||||||||||||||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Plan to make the GHA required after we're sure it's stable