Skip to content

Commit 285c5a7

Browse files
authored
Remove spurious matches in illegal_daml_references hook (#3208)
[static] Signed-off-by: Simon Meier <simon@digitalasset.com>
1 parent a7f0611 commit 285c5a7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

scripts/rename.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ function subcmd_no_illegal_daml_references() {
11741174
)
11751175
for word in "${illegal_words[@]}"; do
11761176
echo "Checking for occurences of '$word' (case-insensitive)"
1177-
if rg -i "$word" daml/ -g '!daml/token-standard' -g '!daml/dars.lock'; then
1177+
if rg -i "$word" daml/ -g '!daml/token-standard' -g '!daml/dars.lock' -g '!**/target/'; then
11781178
echo "$word occurs in Daml code, remove all references"
11791179
exit 1
11801180
fi
@@ -1200,7 +1200,7 @@ function subcmd_no_illegal_daml_references() {
12001200
)
12011201
for pattern in "${illegal_patterns[@]}"; do
12021202
echo "Checking for occurences of '$pattern' (case sensitive, in code other than splitwell)"
1203-
if rg -P "$pattern" daml/ token-standard/ -g '!*/splitwell/*' -g '!*/splitwell-test/*' -g '!daml/dars.lock' -g '!token-standard/README.md' -g '!token-standard/CHANGELOG.md' -g '!*.json' -g '!token-standard/dependencies/*'; then
1203+
if rg -P "$pattern" daml/ token-standard/ -g '!*/splitwell/*' -g '!*/splitwell-test/*' -g '!daml/dars.lock' -g '!token-standard/README.md' -g '!token-standard/CHANGELOG.md' -g '!*.json' -g '!token-standard/dependencies/*' -g '!**/target/'; then
12041204
echo "$pattern occurs in Daml code (other than splitwell), remove all references"
12051205
exit 1
12061206
fi
@@ -1221,11 +1221,11 @@ subcommand_whitelist[no_amulet_in_ui]='Check for Amulet and ANS in user UI'
12211221
function subcmd_no_amulet_in_ui() {
12221222
local illegal_patterns=(
12231223
'(?<!TR)ANS(?!_LEDGER_NAME)'
1224-
"(?<!Splice[./])\bAmulet\b(?!( Rules))"
1224+
"(?<!(Splice[./]|Config \())\bAmulet\b(?!( Rules| Config| to Issue|\)|'))"
12251225
)
12261226
for pattern in "${illegal_patterns[@]}"; do
12271227
echo "Checking for occurences of '$pattern' in frontend code"
1228-
if rg -P "$pattern" -g '*.tsx' -g '*.ts' -g '**test/**/*.scala' -g '!cluster/**' -g '!token-standard/**'; then
1228+
if rg -P "$pattern" -g '*.tsx' -g '*.ts' -g '**test/**/*.scala' -g '!__tests__' -g '!cluster/**' -g '!token-standard/**'; then
12291229
echo "$pattern occurs in frontend, ensure it is not user-visible"
12301230
exit 1
12311231
fi

0 commit comments

Comments
 (0)