Skip to content

Commit

Permalink
Merge pull request #168 from reg-viz/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
bokuweb authored Dec 7, 2024
2 parents dbf5854 + b7ae683 commit 1903d8a
Show file tree
Hide file tree
Showing 13 changed files with 325 additions and 38 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- run: pnpm install
version: 9
- run: pnpm i --frozen-lockfile
- run: pnpm package
- name: deploy
uses: s0/git-publish-subdir-action@develop
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- run: pnpm install
version: 9
- run: pnpm i --frozen-lockfile
- run: pnpm package
- name: deploy
uses: s0/git-publish-subdir-action@develop
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- run: pnpm install
version: 9
- run: pnpm i --frozen-lockfile
- run: pnpm package
- uses: ./dist
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_with_target_hash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ jobs:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v2
with:
version: 8
- run: pnpm install
version: 9
- run: pnpm i --frozen-lockfile
- run: pnpm package
- uses: actions/github-script@v5
id: target
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ The custom report page link.
- Type: String
- Default: N/A

Path of the generated report html file. This file can be deployed in other Actions steps, but is not included in the artifact. If omitted, no html report is generated.
Path of the generated report html file. This file can be deployed in other Actions steps, but is not included in the artifact. If omitted, treated as `./report.html`.

#### `artifact-name` (Optional)

Expand Down
2 changes: 1 addition & 1 deletion dist/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,5 @@ inputs:
required: false
runs:
using: "node20"
main: "lib/index.js"
main: "lib/index.cjs"

12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
"private": true,
"description": "github actions for reg",
"main": "lib/main.js",
"type": "module",
"scripts": {
"build": "tsc",
"package:cli": "ncc build node_modules/reg-cli/dist/diff.js -o dist/lib && mv dist/lib/index.js dist/lib/diff.js",
"package:resources": "cp node_modules/reg-cli/report dist -r && cp node_modules/reg-cli/template dist -r",
"package": "npm run build && npm run package:cli && npm run package:resources && ncc build --source-map --license licenses.txt -o dist/lib"
"package:entry": "esbuild node_modules/@bokuweb/reg-cli-wasm/dist/entry.cjs --bundle --platform=node --format=cjs --outfile=dist/lib/entry.cjs",
"package:worker": "esbuild node_modules/@bokuweb/reg-cli-wasm/dist/worker.cjs --bundle --platform=node --format=cjs --outfile=dist/lib/worker.cjs",
"package:wasm": "cp node_modules/@bokuweb/reg-cli-wasm/dist/shared/reg.wasm dist/lib/reg.wasm",
"package:main": "esbuild src/main.ts --bundle --platform=node --format=cjs --outfile=dist/lib/index.cjs",
"package": "npm run package:entry && npm run package:worker && npm run package:main && npm run package:wasm"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -41,6 +43,7 @@
"@actions/github": "^6.0.0",
"@actions/io": "^1.1.3",
"@actions/tool-cache": "^2.0.1",
"@bokuweb/reg-cli-wasm": "0.0.0-experimental1",
"@types/glob": "^8.1.0",
"adm-zip": "^0.5.16",
"axios": "^1.7.7",
Expand All @@ -59,6 +62,7 @@
"@types/axios": "^0.14.0",
"@types/loglevel": "^1.6.3",
"@types/make-dir": "^2.1.0",
"esbuild": "^0.24.0",
"@types/node": "^22.7.7",
"@vercel/ncc": "^0.38.2",
"typescript": "^5.6.3"
Expand Down
Loading

0 comments on commit 1903d8a

Please sign in to comment.