File tree 2 files changed +12
-7
lines changed
2 files changed +12
-7
lines changed Original file line number Diff line number Diff line change @@ -24,6 +24,7 @@ ALLOWED_LICENSES=(
24
24
' BSD-3-Clause'
25
25
' (BSD-3-Clause OR GPL-2.0)'
26
26
' BSD-3-Clause OR MIT'
27
+ ' (BSD-3-Clause AND Apache-2.0)'
27
28
' CC0-1.0'
28
29
' CC-BY-3.0'
29
30
' CC-BY-4.0'
@@ -73,6 +74,12 @@ APPROVED_MODULES=(
73
74
' github.com/jmespath/go-jmespath' # Apache-2.0 https://github.com/jmespath/go-jmespath/blob/master/LICENSE
74
75
' github.com/ory/keto/proto/ory/keto/opl/v1alpha1' # Apache-2.0 - submodule of keto
75
76
' github.com/ory/keto/proto/ory/keto/relation_tuples/v1alpha2' # Apache-2.0 - submodule of keto
77
+ ' @ory-corp/.*' # Ory IP
78
+ ' github.com/apache/arrow/.*' # Apache-2.0 https://github.com/apache/arrow/blob/main/LICENSE.txt
79
+ ' github.com/ory-corp/webhook-target' # Ory IP
80
+ ' @ory/keto-grpc-client.*' # Apache-2.0 - submodule of keto
81
+ ' [email protected] ' # MIT: https://github.com/Rich-Harris/golden-fleece/blob/master/LICENSE
82
+ ' github.com/gogo/googleapis/.*' # Apache-2.0 https://github.com/gogo/googleapis/blob/master/LICENSE
76
83
)
77
84
78
85
# These lines in the output should be ignored (plain text, no regex).
Original file line number Diff line number Diff line change @@ -6,12 +6,11 @@ bin_dir="$(cd "$(dirname "$0")" && pwd)"
6
6
# list Node licenses
7
7
if [ -f package.json ]; then
8
8
if jq -e ' .dependencies and (.dependencies | keys | length > 0)' package.json > /dev/null; then
9
- npm install > /dev/null 2>&1
10
- npm exec --yes license-checker -- --production --csv --excludePrivatePackages --customPath " ${bin_dir} " /license-template-node.json | grep -v ' ^$'
11
- { echo ; } 2> /dev/null
9
+ npx --yes license-checker --production --csv --excludePrivatePackages --customPath " ${bin_dir} " /license-template-node.json | grep -v ' ^$'
10
+ echo
12
11
else
13
12
echo " No dependencies found in package.json" >&2
14
- { echo ; } 2> /dev/null
13
+ echo
15
14
fi
16
15
fi
17
16
@@ -26,15 +25,14 @@ if [ -f go.mod ]; then
26
25
sort -u |
27
26
awk -F/ ' { if ($1 == "github.com" && NF >= 3) { print $1"/"$2"/"$3 } else { print } }' |
28
27
sort -u
29
- { echo ; } 2> /dev/null
30
28
)
31
29
if [ -z " $go_modules " ]; then
32
30
echo " No Go modules found" >&2
33
31
else
34
32
# Workaround until https://github.com/google/go-licenses/issues/307 is fixed
35
33
# .bin/go-licenses report "$module_name" --template .bin/license-template-go.tpl 2>/dev/null
36
34
#
37
- echo " $go_modules " | xargs -I {} sh -c ' .bin/go-licenses report --template .bin/license-template-go.tpl {}' 2> /dev/null | grep -v ' ^$'
38
- { echo ; } 2> /dev/null
35
+ echo " $go_modules " | xargs -I {} sh -c ' .bin/go-licenses report --template .bin/license-template-go.tpl {}' | grep -v ' ^$'
36
+ echo
39
37
fi
40
38
fi
You can’t perform that action at this time.
0 commit comments