From f757b879ebc74de1d02a061ad3dd75166d7d6d60 Mon Sep 17 00:00:00 2001 From: Starkware Date: Thu, 19 Sep 2024 15:51:41 +0000 Subject: [PATCH] chore(infra): move scarb install to root --- Scarb.lock | 7 +++++++ Scarb.toml | 2 +- package.json | 2 +- {workspace/scripts => scripts}/postinstall.js | 11 +++++++++-- workspace/apps/staking/contracts/package.json | 3 +-- workspace/packages/contracts/package.json | 1 - 6 files changed, 19 insertions(+), 7 deletions(-) rename {workspace/scripts => scripts}/postinstall.js (73%) diff --git a/Scarb.lock b/Scarb.lock index 2fcfd4e..c6a366d 100644 --- a/Scarb.lock +++ b/Scarb.lock @@ -99,6 +99,13 @@ version = "0.15.1" source = "registry+https://scarbs.xyz/" checksum = "sha256:981ebd7ddfbd9fc03515fa7790ca41c8b721ea020412651510ab63e40ebd2303" +[[package]] +name = "perpetuals" +version = "0.1.0" +dependencies = [ + "snforge_std", +] + [[package]] name = "snforge_scarb_plugin" version = "0.2.0" diff --git a/Scarb.toml b/Scarb.toml index 925f9ed..a2a3224 100644 --- a/Scarb.toml +++ b/Scarb.toml @@ -1,5 +1,5 @@ [workspace] -members = ["workspace/apps/staking/contracts", "workspace/packages/contracts"] +members = ["workspace/apps/staking/contracts", "workspace/packages/contracts", "workspace/apps/perpetuals/contracts"] [workspace.dependencies] diff --git a/package.json b/package.json index b09dd44..0c2a9d6 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "dev": "turbo run dev --parallel", "dev:apps": "node ./scripts/dev-apps.js", "format": "sort-package-json && prettier --write \"**.+(js|json|md|yaml)\" && turbo run format --parallel", - "postinstall": "pnpm manypkg:check", + "postinstall": "pnpm manypkg:check && node ./scripts/postinstall.js", "lint": "turbo run lint", "manypkg:check": "manypkg check || exit 0", "npkill": "npkill", diff --git a/workspace/scripts/postinstall.js b/scripts/postinstall.js similarity index 73% rename from workspace/scripts/postinstall.js rename to scripts/postinstall.js index 1354e1c..aa8a9fd 100644 --- a/workspace/scripts/postinstall.js +++ b/scripts/postinstall.js @@ -14,8 +14,15 @@ process.env['PATH'] = `${process.env['PATH']}:${process.env['HOME']}/.asdf/bin:$ if (process.env.CI) { fs.appendFileSync(process.env.GITHUB_ENV, `PATH=${process.env['PATH']}\n`); } else { - execSync(`echo -e "\\n. ~/.asdf/asdf.sh" >> ~/.bashrc`); - execSync(`echo -e "\\n. ~/.asdf/completions/asdf.bash" >> ~/.bashrc`); + try { + // Check if the asdf.sh exists in .bashrc + execSync(`grep -Fq asdf.sh ~/.bashrc`); + // If grep finds the line, it means it exists + } catch (err) { + // If grep fails, it means the text doesn't exist, so we append it + execSync(`printf "\\n. ~/.asdf/asdf.sh" >> ~/.bashrc`); + execSync(`printf "\\n. ~/.asdf/completions/asdf.bash" >> ~/.bashrc`); + } } // Install scarb diff --git a/workspace/apps/staking/contracts/package.json b/workspace/apps/staking/contracts/package.json index 6986454..634f2bb 100644 --- a/workspace/apps/staking/contracts/package.json +++ b/workspace/apps/staking/contracts/package.json @@ -1,6 +1,6 @@ { "name": "@staking/contracts", - "version": "0.1.1-dev.219", + "version": "0.1.1-dev.220", "private": true, "description": "staking contracts", "scripts": { @@ -8,7 +8,6 @@ "clean": "scarb clean && snforge clean-cache", "dev": "scarb cairo-run", "format": "pnpm sort-package-json && scarb fmt", - "postinstall": "node ../../../scripts/postinstall.js", "lint": "scarb fmt --check", "test": "scarb test" }, diff --git a/workspace/packages/contracts/package.json b/workspace/packages/contracts/package.json index 80b5334..2066749 100644 --- a/workspace/packages/contracts/package.json +++ b/workspace/packages/contracts/package.json @@ -7,7 +7,6 @@ "clean": "scarb clean && snforge clean-cache", "dev": "scarb cairo-run", "format": "pnpm sort-package-json && scarb fmt", - "postinstall": "node ../../scripts/postinstall.js", "lint": "scarb fmt --check", "test": "scarb test" },