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

Jump to bottom

Move test utils in the src dir #206

Closed
wants to merge 6 commits into from
Closed

Move test utils in the src dir #206

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
873da3b
refactor: move test utils in src dir
andreivladbrg Oct 23, 2023
593cc7f
ci: install node js dependencies in build job
andreivladbrg Oct 23, 2023
cc7228c
build: install forge-std as NPM package
andreivladbrg Oct 30, 2023
cb005a0
build: move forge-std and prb-test in devDependencies
andreivladbrg Oct 30, 2023
fd1f855
ci: remove installing submodules step
andreivladbrg Oct 30, 2023
2d2f02b
build: include test utils package files
andreivladbrg Nov 15, 2023
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
28 changes: 28 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,20 @@ jobs:
with:
submodules: "recursive"

- name: "Install Pnpm"
uses: "pnpm/action-setup@v2"
with:
version: "8"

- name: "Install Node.js"
uses: "actions/setup-node@v3"
with:
cache: "pnpm"
node-version: "lts/*"

- name: "Install the Node.js dependencies"
run: "pnpm install"

- name: "Install Foundry"
uses: "foundry-rs/foundry-toolchain@v1"

Expand All @@ -74,6 +88,20 @@ jobs:
- name: "Install Foundry"
uses: "foundry-rs/foundry-toolchain@v1"

- name: "Install Pnpm"
uses: "pnpm/action-setup@v2"
with:
version: "8"

- name: "Install Node.js"
uses: "actions/setup-node@v3"
with:
cache: "pnpm"
node-version: "lts/*"

- name: "Install the Node.js dependencies"
run: "pnpm install"

- name: "Run the tests"
run: "forge test"

Expand Down
6 changes: 1 addition & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
[submodule "lib/forge-std"]
branch = "v1"
path = "lib/forge-std"
url = "https://github.com/foundry-rs/forge-std"
[submodule "lib/prb-test"]
branch = "release-v0"
path = "lib/prb-test"
url = "https://github.com/PaulRBerg/prb-test"
url = "https://github.com/foundry-rs/forge-std"
1 change: 0 additions & 1 deletion lib/prb-test
Open in desktop
Submodule prb-test deleted from 1e9ead
3 changes: 3 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
"bugs": {
"url": "https://github.com/PaulRBerg/prb-math/issues"
},
"dependencies": {
andreivladbrg marked this conversation as resolved.
Show resolved Hide resolved
"@prb/test": "0.6.4"
},
"devDependencies": {
"prettier": "^2.8.7",
"solhint-community": "^3.5.2"
Expand Down
11 changes: 10 additions & 1 deletion pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion remappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@prb/test/=lib/prb-test/src/
@prb/test/=node_modules/@prb/test/
forge-std/=lib/forge-std/src/
Loading