Skip to content

Commit

Permalink
fix: pnpm instead of npm in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
jatZama committed Mar 6, 2024
1 parent b89fef8 commit 448f87e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 21 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- uses: pnpm/action-setup@v3
with:
version: 8
- run: cp .env.example .env
- run: npm ci
- run: npm run prettier:check
- name: "npm CI test"
- run: pnpm install
- run: pnpm prettier:check
- name: "pnpm CI test"
run: |
# sometimes not created and is not tailed
touch fhevm.log
npm run fhevm:start &> fhevm.log &
pnpm fhevm:start &> fhevm.log &
tail -f fhevm.log | sed '/Starting JSON WebSocket server/ q'
npm run fhevm:faucet
npm run test
npm run fhevm:stop || true
pnpm fhevm:faucet
pnpm test
pnpm fhevm:stop || true
19 changes: 9 additions & 10 deletions .github/workflows/testmock.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Pull request tests with mocks
name: Pull request tests

on:
pull_request:
Expand All @@ -7,19 +7,18 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: large_ubuntu_16
strategy:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
- uses: pnpm/action-setup@v3
with:
version: 8
- run: cp .env.example .env
- run: npm ci
- name: "npm CI test"
run: |
# sometimes not created and is not tailed
npm run test:mock
- run: pnpm install
- run: pnpm prettier:check
- name: "pnpm CI test:moc"
run: pnpm test:mock
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ deployments
.DS_Store
.pnp.*
coverage.json
pnpm-lock.yaml
package-lock.json
yarn.lock

0 comments on commit 448f87e

Please sign in to comment.