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 9df9d93 + 3541ce8 commit 60bcd6f
Show file tree
Hide file tree
Showing 7 changed files with 2,887 additions and 2,729 deletions.
31 changes: 16 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,32 @@ 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: Install Playwright Browsers
run: yarn playwright install --with-deps chromium
run: npx playwright install --with-deps chromium
- name: Run Unit tests
run: yarn vitest
run: npx vitest
- name: Run Playwright tests
run: yarn playwright test
run: npx playwright test
- uses: actions/upload-artifact@v3
if: always()
with:
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,6 @@ dist
# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/
.pnp.*

# playwright
/test-results/
/playwright-report/
Expand Down
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", "ms-playwright.playwright"]
"recommendations": ["vitest.explorer", "ms-playwright.playwright"]
}
1 change: 0 additions & 1 deletion .yarnrc.yml

This file was deleted.

Loading

0 comments on commit 60bcd6f

Please sign in to comment.