Skip to content

Commit

Permalink
Revert "Switch to pnpm"
Browse files Browse the repository at this point in the history
This reverts commit fbc22ae.
  • Loading branch information
weedz committed Jun 30, 2021
1 parent dc8e1d4 commit b83c851
Show file tree
Hide file tree
Showing 6 changed files with 13,551 additions and 4,379 deletions.
16 changes: 2 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ on:
tags:
- "v*"

env:
PNPM_CACHE_FOLDER: .pnpm-store

jobs:
release:
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' || startsWith(github.ref, 'refs/tags/v')
Expand All @@ -33,22 +30,13 @@ jobs:
if: runner.os == 'macOS'
run: brew install openssl

- name: install pnpm
uses: pnpm/action-setup@v2
with:
version: 6

- name: setup pnpm config
run: pnpm config set store-dir $PNPM_CACHE_FOLDER

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v2
with:
node-version: 15

- name: Install node dependencies
run: pnpm i --ignore-scripts
run: npm ci --ignore-scripts
- name: Build
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: pnpm run build && pnpm run dist
run: npm run build && npm run dist
21 changes: 3 additions & 18 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,17 @@
name: Test
on: push

env:
PNPM_CACHE_FOLDER: .pnpm-store

jobs:
Lint:
runs-on: ubuntu-latest
steps:
- name: Check out Git repository
uses: actions/checkout@v2

- name: Install Node.js, NPM and Yarn
uses: actions/setup-node@v2
with:
node-version: 15

- name: install pnpm
uses: pnpm/action-setup@v2
with:
version: 6

- name: setup pnpm config
run: pnpm config set store-dir $PNPM_CACHE_FOLDER

- name: Install node dependencies
# Skip install scripts, otherwise we build nodegit on `npm install`.
run: pnpm i --ignore-scripts

# Skip install scripts, otherwise we build nodegit on `npm install`.
run: npm ci --ignore-scripts
- name: Run ESLint
run: pnpm run lint
run: npm run lint
1 change: 0 additions & 1 deletion .npmrc

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ Install https://github.com/Microsoft/vcpkg (C and C++ package manager for window

Install node modules:
```bash
$ pnpm install
$ npm install
```

Then run
```bash
$ pnpm run build
$ npm run build
```
to bundle javascript-files and move assets to the `dist/` directory.

Now run
```bash
$ pnpm run dist
$ npm run dist
```
to compile all the native dependencies etc. You can run this with `CC="ccache gcc" JOBS=max pnpm run dist` (omit `CC="ccache gcc"` if you don't have `ccache` installed) to speed up compile time.
to compile all the native dependencies etc. You can run this with `CC="ccache gcc" JOBS=max npm run dist` (omit `CC="ccache gcc"` if you don't have `ccache` installed) to speed up compile time.
Loading

0 comments on commit b83c851

Please sign in to comment.