Skip to content

Commit

Permalink
Merge pull request #198 from yamadashy/chore/yarn-to-npm
Browse files Browse the repository at this point in the history
chore: yarnではなくnpmを使うようにする
  • Loading branch information
yamadashy authored Dec 1, 2024
2 parents 3756395 + 48fd1b9 commit 0055d1e
Show file tree
Hide file tree
Showing 10 changed files with 17,761 additions and 14,223 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
cache: yarn
- run: yarn install
- run: yarn lint-biome && git diff --exit-code
cache: npm
- run: npm ci
- run: npm run lint-biome && git diff --exit-code

lint-ts:
name: Lint TypeScript
Expand All @@ -30,9 +30,9 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
cache: yarn
- run: yarn install
- run: yarn lint-ts
cache: npm
- run: npm ci
- run: npm run lint-ts

lint-secretlint:
name: Lint Secretlint
Expand All @@ -43,9 +43,9 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
cache: yarn
- run: yarn install
- run: yarn lint-secretlint
cache: npm
- run: npm ci
- run: npm run lint-secretlint

lint-renovate-config:
name: Lint Renovate config
Expand Down Expand Up @@ -84,9 +84,9 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
cache: yarn
- run: yarn install
- run: yarn test-coverage
cache: npm
- run: npm ci
- run: npm run test-coverage

generate:
name: Generate feed and site
Expand All @@ -97,12 +97,12 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
cache: yarn
- run: yarn install
cache: npm
- run: npm ci
- name: Generate feed
run: yarn feed-generate
run: npm run feed-generate
- name: Generate site
run: yarn site-build
run: npm run site-build
- name: Archive feed
uses: actions/upload-artifact@v4
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/external-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
cache: yarn
- run: yarn install
cache: npm
- run: npm ci
- name: Run External Tests
run: yarn test-external
run: npm run test-external
8 changes: 4 additions & 4 deletions .github/workflows/generate-feed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
uses: actions/setup-node@v4
with:
node-version-file: .tool-versions
cache: yarn
cache: npm

- name: Install node packages
run: yarn install
run: npm ci

- name: Get date
id: get-date
Expand All @@ -46,10 +46,10 @@ jobs:
key: ${{ runner.os }}-feed-images-${{ steps.get-date.outputs.date }}

- name: Generate feed
run: yarn feed-generate
run: npm run feed-generate

- name: Generate site
run: yarn site-build
run: npm run site-build

- name: Push to GitHub Pages
uses: peaceiris/actions-gh-pages@v4
Expand Down
934 changes: 0 additions & 934 deletions .yarn/releases/yarn-4.5.3.cjs

This file was deleted.

7 changes: 0 additions & 7 deletions .yarnrc.yml

This file was deleted.

10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,25 +64,25 @@ GitHub Actions で定期的に更新されており、サイトの生成は [Ele

パッケージのインストール
```bash
$ yarn
$ npm install
```

フィード生成とサイト立ち上げ
```bash
$ # フィードを取得して作成
$ yarn feed-generate
$ npm run feed-generate

$ # localhost:8080 で確認
$ yarn site-serve
$ npm run site-serve
```

コードのチェック
```bash
$ # eslint, tsc --noEmit
$ yarn lint
$ npm run lint

$ # テスト
$ yarn test
$ npm run test
```

## ライセンス
Expand Down
Loading

0 comments on commit 0055d1e

Please sign in to comment.