Skip to content

Commit 9bee201

Browse files
committed
fixup
Signed-off-by: Anatolii Bazko <[email protected]>
1 parent 4934349 commit 9bee201

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

build/scripts/clear-defined-test.sh

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ declare -A replaced_modules=(
8282
["go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0"]="github.com/open-telemetry/opentelemetry-go-contrib v1.35.0"
8383
# https://github.com/census-instrumentation/opencensus-go/commits/v0.23.0/
8484
["go.opencensus.io v0.23.0"]="census-instrumentation/opencensus-go 49838f207d61097fc0ebb8aeef306913388376ca"
85+
# https://github.com/census-instrumentation/opencensus-go/commits/v0.24.0/
86+
["go.opencensus.io v0.24.0"]="census-instrumentation/opencensus-go b1a01ee95db0e690d91d7193d037447816fae4c5"
8587
# https://github.com/sean-/seed/tree/e2103e2c35297fb7e17febb81e49b312087a2372
8688
["github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"]="sean-/seed e2103e2c35297fb7e17febb81e49b312087a2372"
8789
)
@@ -101,9 +103,13 @@ declare -A replaced_api_suffix=(
101103

102104
# Exceptions for dependencies that are not yet harvested in clearlydefined.io
103105
# License must be checked manually
104-
declare -A ignored_paths=()
106+
declare -A ignored_paths=(
107+
["github.com/decred/dcrd/dcrec/secp256k1/v4"]="Harvesting is in progress"
108+
)
105109

106-
declare -A ignored_paths_license=()
110+
declare -A ignored_paths_license=(
111+
["github.com/decred/dcrd/dcrec/secp256k1/v4"]="ISC"
112+
)
107113

108114
retryUrl() {
109115
url=$1
@@ -203,12 +209,16 @@ go list -m -mod=mod all | while read -r module; do
203209
license=$(curl -s "$url" | jq -r '.licensed.declared')
204210
license="${license%% AND*}"
205211

212+
# Handle OR licenses - split and check each one
213+
IFS=' OR ' read -ra license_parts <<< "$license"
206214
license_approved=false
207-
for allowed_license in "${allowed_licenses[@]}"; do
208-
if [[ "$allowed_license" == "$license" ]]; then
209-
license_approved=true
210-
break
211-
fi
215+
for license_part in "${license_parts[@]}"; do
216+
for allowed_license in "${allowed_licenses[@]}"; do
217+
if [[ "${allowed_license^^}" == "${license_part^^}" ]]; then
218+
license_approved=true
219+
break 2
220+
fi
221+
done
212222
done
213223

214224
if [[ $license_approved == "false" ]]; then

0 commit comments

Comments
 (0)