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.

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

fix: Reverted to using npm #6

Merged
merged 1 commit into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 4 additions & 9 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,17 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Setup PNPM
uses: pnpm/action-setup@v2
with:
version: 8

- name: Setup Node - ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
cache: 'npm'

- name: Install dependencies
run: pnpm install
run: npm install

- name: Generate Prisma Client
run: pnpm exec prisma generate
run: npx prisma generate

- name: Run Build
run: pnpm run build
run: npm run build
11 changes: 3 additions & 8 deletions .github/workflows/style.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,14 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Setup PNPM
uses: pnpm/action-setup@v2
with:
version: 8

- name: Setup Node - ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
cache: 'npm'

- name: Install dependencies
run: pnpm install
run: npm install

- name: Check Format
run: pnpm exec prettier --check .
run: npx prettier --check .
15 changes: 5 additions & 10 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,28 +59,23 @@ jobs:
- name: Setup Redis server
uses: supercharge/[email protected]

- name: Setup PNPM
uses: pnpm/action-setup@v2
with:
version: 8

- name: Setup Node - ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'
cache: 'npm'

- name: Install dependencies
run: pnpm install
run: npm install

- name: Run prisma migrations & generate prisma client
run: pnpm exec prisma migrate dev
run: npx prisma migrate dev

- name: Lint code
run: pnpm run lint
run: npm run lint

- name: Run tests
run: pnpm run test --coverage
run: npm run test -- --coverage

- name: Comment coverage report on pull request
if: ${{ github.event_name == 'pull_request' }}
Expand Down
1 change: 0 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
node_modules
pnpm-lock.yaml
package-lock.json
prisma
build
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
migrate-dev:
pnpm exec prisma migrate dev
npx prisma migrate dev
migrate-deploy:
pnpm exec prisma migrate deploy
npx prisma migrate deploy
migrate-reset:
pnpm exec prisma migrate reset
npx prisma migrate reset
prisma-generate:
pnpm exec prisma generate
npx prisma generate
prod:
pnpm run build
pnpm run start
npm run build
npm run start
dev:
pnpm run dev
npm run dev
test:
pnpm run test
npm run test
test-coverage:
pnpm run test --coverage
npm run test -- --coverage
format:
pnpm run format
npm run format
14 changes: 14 additions & 0 deletions package-lock.json

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

Loading