Skip to content

Commit

Permalink
👷 改进工作流
Browse files Browse the repository at this point in the history
  • Loading branch information
A-kirami committed Nov 30, 2024
1 parent 5ebe25a commit d4528f6
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
14 changes: 6 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,19 @@ jobs:
if: matrix.os != 'windows-latest'
uses: swatinem/rust-cache@v2
with:
workspaces: './src-tauri -> target'
workspaces: ./src-tauri -> target

- name: Pnpm setup
uses: pnpm/action-setup@v3
with:
version: 9
uses: pnpm/action-setup@v4

- name: Sync node version and setup cache
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
node-version-file: package.json
cache: pnpm

- name: Install app dependencies and build web
run: pnpm i
- name: Install app dependencies
run: pnpm install

- name: Rustup add target
run: rustup target add ${{ matrix.target }}
Expand Down
18 changes: 8 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,19 @@ jobs:
if: matrix.os != 'windows-latest'
uses: swatinem/rust-cache@v2
with:
workspaces: './src-tauri -> target'
workspaces: ./src-tauri -> target

- name: Pnpm setup
uses: pnpm/action-setup@v3
with:
version: 9
uses: pnpm/action-setup@v4

- name: Sync node version and setup cache
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'
node-version-file: package.json
cache: pnpm

- name: Install app dependencies and build web
run: pnpm i
- name: Install app dependencies
run: pnpm install

- name: Rustup add target
run: rustup target add ${{ matrix.target }}
Expand All @@ -84,8 +82,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
with:
tagName: 'v__VERSION__'
releaseName: 'Matcha v__VERSION__'
tagName: v__VERSION__
releaseName: Matcha v__VERSION__
releaseBody: ${{ needs.changelog.outputs.changelog }}
releaseDraft: true
args: -t ${{ matrix.target }}
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,9 @@
],
"*.{vue,css,scss,sass}": "stylelint --fix",
"*.{html,vue,js,ts,jsx,tsx,json,md}": "prettier --write --ignore-unknown"
}
},
"engines": {
"node": ">=22.11.0"
},
"packageManager": "[email protected]"
}

0 comments on commit d4528f6

Please sign in to comment.