Skip to content

Commit

Permalink
Fix: やっぱpnpmにする
Browse files Browse the repository at this point in the history
  • Loading branch information
sevenc-nanashi committed Jun 18, 2024
1 parent 490796a commit 2ff4323
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 16 deletions.
35 changes: 24 additions & 11 deletions .github/workflows/build-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,20 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- uses: oven-sh/setup-bun@v1
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
bun-version: latest
version: 9

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 20
cache: pnpm

- name: Install dependencies
run: |
bun i
pnpm i
- name: Change version in package.json
run: |
Expand All @@ -36,12 +43,12 @@ jobs:
RAW_VERSION="${{ github.ref_name }}" # "
VERSION=${RAW_VERSION#v}
fi
bun update-version.js $VERSION
pnpm update-version.js $VERSION
echo Version: $VERSION
- name: Build with vite
run: |
bun build:vite
pnpm build:vite
- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -84,14 +91,20 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- uses: oven-sh/setup-bun@v1
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 9

- name: Setup node
uses: actions/setup-node@v4
with:
bun-version: latest
node-version: 20
cache: pnpm

- name: Install dependencies
run: |
bun i
bun pm trust --all
pnpm i
- name: Download artifact
uses: actions/download-artifact@v4
Expand All @@ -108,12 +121,12 @@ jobs:
RAW_VERSION="${{ github.ref_name }}" # "
VERSION=${RAW_VERSION#v}
fi
bun update-version.js $VERSION
pnpm update-version.js $VERSION
echo Version: $VERSION
- name: Build electron
run: |
bun build:electron ${{ matrix.build-args }}
pnpm build:electron ${{ matrix.build-args }}
- name: Change extension
if: matrix.ext != ''
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,21 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4

- uses: oven-sh/setup-bun@v1
- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
bun-version: latest
version: 9

- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 20
cache: pnpm

- name: Install dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: |
bun i
pnpm i
- name: Run Lint
run: |
bun lint
pnpm lint
Binary file removed bun.lockb
Binary file not shown.

0 comments on commit 2ff4323

Please sign in to comment.