From 448f87e4cebd3d77a6111b3274b18b56e710a0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joseph-Andr=C3=A9=20Turk?= Date: Wed, 6 Mar 2024 17:49:31 +0100 Subject: [PATCH] fix: pnpm instead of npm in CI --- .github/workflows/test.yml | 20 ++++++++++---------- .github/workflows/testmock.yml | 19 +++++++++---------- .gitignore | 2 +- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1642f1c..8cb4fd1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 \ No newline at end of file diff --git a/.github/workflows/testmock.yml b/.github/workflows/testmock.yml index 7a69067..11dcc2e 100644 --- a/.github/workflows/testmock.yml +++ b/.github/workflows/testmock.yml @@ -1,4 +1,4 @@ -name: Pull request tests with mocks +name: Pull request tests on: pull_request: @@ -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 \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2dab1d9..18a269e 100644 --- a/.gitignore +++ b/.gitignore @@ -17,5 +17,5 @@ deployments .DS_Store .pnp.* coverage.json -pnpm-lock.yaml +package-lock.json yarn.lock