Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API参照先を変更 #83

Merged
merged 2 commits into from
Jan 18, 2024
Merged

API参照先を変更 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21df66f
API参照先をGitHub上公開ファイル変更
Pugma Jan 18, 2024
30a2827
`setup-node`と`artifact`をv4に / 不要なnpmコマンドの廃止
Pugma Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
cache: npm
Expand All @@ -22,13 +22,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
cache: npm
- run: SKIP_GENAPI=1 npm ci
- run: npm run postinstall
- uses: actions/upload-artifact@v3
- run: npm ci
- uses: actions/upload-artifact@v4
with:
name: apis
path: ./src/lib/apis/generated
Expand All @@ -38,12 +37,12 @@ jobs:
needs: [packages, genApi]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
cache: npm
- run: SKIP_GENAPI=1 npm ci
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: apis
path: ./src/lib/apis/generated
Expand All @@ -56,12 +55,12 @@ jobs:
needs: [packages, genApi]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
cache: npm
- run: SKIP_GENAPI=1 npm ci
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: apis
path: ./src/lib/apis/generated
Expand All @@ -72,12 +71,12 @@ jobs:
needs: [packages, genApi]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
cache: npm
- run: SKIP_GENAPI=1 npm ci
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: apis
path: ./src/lib/apis/generated
Expand All @@ -88,12 +87,12 @@ jobs:
needs: [packages, genApi]
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version-file: .node-version
cache: npm
- run: SKIP_GENAPI=1 npm ci
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: apis
path: ./src/lib/apis/generated
Expand Down
6 changes: 2 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
"fix:format": "prettier --write src",
"lint": "eslint --ext .ts,.vue src",
"type-check": "tsc",
"fetch-openapi": "node scripts/fetchOpenapi.js",
"gen-api": "node scripts/generateApi.js",
"start-mock": "prism mock -p 4010 -d scripts/traPortfolio.v1.yaml",
"clean": "rimraf scripts/traPorfolio.v1.yaml src/lib/apis/generated",
"postinstall": "npm run fetch-openapi && npm run gen-api"
"start-mock": "prism mock -p 4010 -d https://github.com/traPtitech/traPortfolio/blob/main/docs/swagger/traPortfolio.v1.yaml",
"postinstall": "npm run gen-api"
},
"dependencies": {
"@iconify/iconify": "^3.1.1",
Expand Down
21 changes: 0 additions & 21 deletions scripts/fetchOpenapi.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/generateApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const { promisify } = require('util')
const execPromise = promisify(exec)
const addApis = require('./addApis')

const SWAGGER_PATH = 'scripts/traPortfolio.v1.yaml'
const SWAGGER_PATH = 'https://raw.githubusercontent.com/traPtitech/traPortfolio/main/docs/swagger/traPortfolio.v1.yaml'
const GENERATED_DIR = 'src/lib/apis/generated'

const npx = process.platform === 'win32' ? 'npx.cmd' : 'npx'
Expand Down