Skip to content

Commit

Permalink
fix: switch from bun to yarn as a quick fix for the build
Browse files Browse the repository at this point in the history
  • Loading branch information
hiddentao committed Feb 15, 2024
1 parent bbb4050 commit 72112ca
Show file tree
Hide file tree
Showing 5 changed files with 1,215 additions and 18 deletions.
18 changes: 7 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ jobs:
with:
submodules: recursive

- uses: actions/setup-node@v3
with:
node-version: 20
cache: "yarn"

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
with:
Expand All @@ -33,21 +38,12 @@ jobs:
- name: Install solc
run: svm install 0.8.20 && svm use 0.8.20

- name: Install dependencies for bun
run: apt-get install -y unzip

- name: Install bun
uses: oven-sh/setup-bun@v1

# - name: Install NPM dependencies
# run: bun i

- name: Compile
run: bun compile --sizes
run: yarn compile --sizes
id: build

- name: Run tests
run: bun test
run: yarn test
id: test


10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,30 @@ _TODO: Live deployed addresses here_
Install pre-requisites:

* [Foundry](https://book.getfoundry.sh/)
* [Bun](https://bun.sh)
* [Yarn](https://yarnpkg.com/)

Then run:

```shell
$ bun i
$ yarn
```

To compile the contracts:

```shell
$ bun compile
$ yarn build
```

To test:

```shell
$ bun tests
$ yarn test
```

To run a local devnet:

```shell
$ bun devnet
$ yarn devnet
```

### Deployment
Expand Down
Binary file removed bun.lockb
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"type": "module",
"scripts": {
"prepare": "forge install && husky",
"compile": "forge build",
"tests": "forge test",
"build": "forge build",
"test": "forge test",
"devnet": "anvil",
"commitlint": "commitlint --edit"
},
Expand Down
Loading

0 comments on commit 72112ca

Please sign in to comment.