Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove submodules except for the forge standard libraries and rely on npm #241

Merged
merged 2 commits into from
Feb 24, 2024
Merged

Remove submodules except for the forge standard libraries and rely on npm #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85a48fe
Remove all submodules except forge-std, to avoid duplication with the…
edmundedgar Feb 24, 2024
d819f1d
Put the npm install in the forge test task as we now rely on it to in…
edmundedgar Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
with:
version: nightly

- run: npm install

- name: Run Forge build
run: |
forge --version
Expand Down
9 changes: 0 additions & 9 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion lib/openzeppelin-contracts
Open in desktop
Submodule openzeppelin-contracts deleted from d00ace
1 change: 0 additions & 1 deletion lib/openzeppelin-contracts-upgradeable
Open in desktop
Submodule openzeppelin-contracts-upgradeable deleted from bc9552
1 change: 0 additions & 1 deletion lib/zkevm-contracts
Open in desktop
Submodule zkevm-contracts deleted from c16973
5 changes: 1 addition & 4 deletions remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Loading