Merge pull request #241 from RealityETH/prRemoveSubmodules

Remove submodules except for the forge standard libraries and rely on npm
RealityETH · Feb 24, 2024 · fcd2a19 · fcd2a19
2 parents 4a8ce11 + d819f1d
commit fcd2a19
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 16 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,6 +26,8 @@ jobs:
         with:
           version: nightly
 
+      - run: npm install
+
       - name: Run Forge build
         run: |
           forge --version

diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,3 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/openzeppelin-contracts"]
-	path = lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/openzeppelin-contracts-upgradeable"]
-	path = lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-[submodule "lib/zkevm-contracts"]
-	path = lib/zkevm-contracts
-	url = https://github.com/RealityETH/zkevm-contracts
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/lib/openzeppelin-contracts-upgradeable b/lib/openzeppelin-contracts-upgradeable
diff --git a/lib/zkevm-contracts b/lib/zkevm-contracts
diff --git a/remappings.txt b/remappings.txt
@@ -1,5 +1,2 @@
 ds-test/=lib/forge-std/lib/ds-test/src/
-forge-std/=lib/forge-std/src/
-@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
-@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
-@RealityETH/zkevm-contracts/=lib/zkevm-contracts/
+forge-std/=lib/forge-std/src/