Skip to content

Commit

Permalink
Merge pull request #29 from mslxl/refactor-status
Browse files Browse the repository at this point in the history
refactor:  optimize status structure
  • Loading branch information
mslxl authored Mar 24, 2024
2 parents c266922 + fec98b3 commit fa6de80
Show file tree
Hide file tree
Showing 58 changed files with 1,828 additions and 1,118 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-on-pr-comment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "test-on-pr-issue"
name: "build-on-pr-comment"
on:
issue_comment:
types: [created]
Expand Down
16 changes: 12 additions & 4 deletions .github/workflows/test-on-pr.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
name: "test-on-pr"
on: [pull_request]
name: "test-on-pr-issue"
on:
issue_comment:
types: [created]

jobs:
test-tauri:
if: github.event.issue.pull_request && (contains(github.event.comment.body, '/test') || contains(github.event.comment.body, '/build'))
strategy:
fail-fast: false
fail-fast: true
matrix:
platform: [macos-latest, ubuntu-20.04, windows-latest]

runs-on: ${{ matrix.platform }}
steps:
- uses: xt0rted/pull-request-comment-branch@v2
id: comment-branch
- uses: actions/checkout@v3
if: success()
with:
ref: ${{ steps.comment-branch.outputs.head_ref }}
- name: setup node
uses: actions/setup-node@v3
with:
Expand All @@ -33,4 +41,4 @@ jobs:
workspaces: "./src-tauri -> target"
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"dbaeumer.vscode-eslint",
"bradlc.vscode-tailwindcss",
"styled-components.vscode-styled-components",
"tauri-apps.tauri-vscode"
"tauri-apps.tauri-vscode",
"gruntfuggly.todo-tree"
]
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"@replit/codemirror-emacs": "^6.0.1",
"@replit/codemirror-vim": "^6.1.0",
"@tauri-apps/api": "^1.5.1",
"@types/ws": "^8.5.10",
"@uiw/codemirror-themes-all": "^4.21.21",
"axios": "^1.6.2",
"axios-tauri-api-adapter": "^0.2.0",
Expand All @@ -50,16 +49,12 @@
"crc": "^4.3.2",
"events": "^3.3.0",
"framer-motion": "^10.16.5",
"immer": "^10.0.3",
"jotai": "^2.5.1",
"jotai-devtools": "^0.7.0",
"jotai-immer": "^0.2.0",
"jotai-optics": "^0.3.1",
"lodash": "^4.17.21",
"lucide-react": "^0.292.0",
"mitt": "^3.0.1",
"normalize.css": "^8.0.1",
"optics-ts": "^2.4.1",
"react": "^18.2.0",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
Expand All @@ -75,7 +70,10 @@
"tauri-plugin-log-api": "github:tauri-apps/tauri-plugin-log#v1",
"tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
"thememirror": "^2.0.1",
"uuid": "^9.0.1",
"vscode-languageserver-protocol": "^3.17.5",
"y-codemirror.next": "^0.3.2",
"yjs": "^13.6.14",
"zod": "^3.22.4"
},
"devDependencies": {
Expand All @@ -84,6 +82,8 @@
"@types/node": "^20.9.1",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"@types/uuid": "^9.0.8",
"@types/ws": "^8.5.10",
"@vitejs/plugin-react": "^4.2.0",
"autoprefixer": "^10.4.16",
"postcss": "^8.4.31",
Expand Down
103 changes: 57 additions & 46 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fa6de80

Please sign in to comment.