From 54f018600e48841f0cd53097aacbcb713db24557 Mon Sep 17 00:00:00 2001 From: Michael Amadi Date: Fri, 15 Nov 2024 18:54:04 +0100 Subject: [PATCH 1/2] fix upgrade-semgrep --- justfile | 2 +- packages/contracts-bedrock/justfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index e40186f75dff0..6438ba36197aa 100644 --- a/justfile +++ b/justfile @@ -61,4 +61,4 @@ check-semgrep: [ "$(just print-semgrep)" = "$(jq -r .semgrep < versions.json)" ] && echo '✓ semgrep versions match' || (echo '✗ semgrep version mismatch. Run `just upgrade-semgrep` to upgrade.' && exit 1) upgrade-semgrep: - jq '.semgrep = $v' --arg v $(just print-semgrep) <<<$(cat versions.json) > versions.json + pip3 install semgrep=="$(jq -r .semgrep < versions.json)" diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile index fe6f4c0834c9c..f72756632ac85 100644 --- a/packages/contracts-bedrock/justfile +++ b/packages/contracts-bedrock/justfile @@ -25,7 +25,7 @@ check-semgrep: # Checks that the correct versions of Foundry and semgrep are installed. check-dependencies: - just check-foundry && just check-semgrep + just check-foundry #&& just check-semgrep # Core forge build command forge-build: From ecb180bc762c9014e3a58f0bcb1ae44605a8aa65 Mon Sep 17 00:00:00 2001 From: Michael Amadi Date: Fri, 15 Nov 2024 18:55:44 +0100 Subject: [PATCH 2/2] fix upgrade-semgrep --- packages/contracts-bedrock/justfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-bedrock/justfile b/packages/contracts-bedrock/justfile index f72756632ac85..fe6f4c0834c9c 100644 --- a/packages/contracts-bedrock/justfile +++ b/packages/contracts-bedrock/justfile @@ -25,7 +25,7 @@ check-semgrep: # Checks that the correct versions of Foundry and semgrep are installed. check-dependencies: - just check-foundry #&& just check-semgrep + just check-foundry && just check-semgrep # Core forge build command forge-build: