Skip to content

Commit

Permalink
Merge pull request #4 from redimpulz/fix_yarn_to_npm
Browse files Browse the repository at this point in the history
yarnからnpmに変更
  • Loading branch information
takahash authored May 9, 2024
2 parents 1a8deac + 620338b commit 75ef193
Show file tree
Hide file tree
Showing 7 changed files with 2,774 additions and 2,046 deletions.
27 changes: 14 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,25 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
- run: corepack enable yarn
- id: yarn
run: echo "cache-dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v3
name: Setup pnpm cache
node-version: 20
- name: Get npm cache directory
id: npm-cache-dir
shell: bash
run: echo "dir=$(npm config get cache)" >> ${GITHUB_OUTPUT}
- uses: actions/cache@v4
name: Setup npm cache
with:
path: ${{ steps.yarn.outputs.cache-dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
path: ${{ steps.npm-cache-dir.outputs.dir }}
key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-yarn-
${{ runner.os }}-npm-
- name: Install dependencies
run: yarn
run: npm install
- name: Test
run: yarn test
run: npm test
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,4 @@ dist
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/
.pnp.*
.vscode-test
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"recommendations": ["ZixuanChen.vitest-explorer"]
"recommendations": ["vitest.explorer"]
}
1 change: 0 additions & 1 deletion .yarnrc.yml

This file was deleted.

Loading

0 comments on commit 75ef193

Please sign in to comment.