diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d2ce9a5feabe6ff8de7e7ce9e60d71c7cb718577..3104c1310279c2a1ce7850f70ff8e7f10621e5cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,21 +11,21 @@ concurrency: cancel-in-progress: true jobs: - publish: + publish-tauri: + permissions: + contents: write strategy: fail-fast: false matrix: include: - - os: windows-latest - target: x86_64-pc-windows-msvc - - os: windows-latest - target: aarch64-pc-windows-msvc - - os: macos-latest - target: aarch64-apple-darwin - - os: macos-latest - target: x86_64-apple-darwin + - platform: 'macos-latest' # for Arm based macs (M1 and above). + args: '--target aarch64-apple-darwin' + - platform: 'macos-latest' # for Intel based macs. + args: '--target x86_64-apple-darwin' + - platform: 'windows-latest' + args: '' - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.platform }} steps: - uses: actions/checkout@v4 @@ -39,18 +39,24 @@ jobs: - name: Install pnpm run: npm install -g pnpm@9.2.0 - # 安装 Rust - - name: install Rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - name: Install dependencies run: pnpm install - name: Build Vite + Tauri run: pnpm build + # 安装 Rust + - name: install Rust stable + uses: dtolnay/rust-toolchain@stable # Set this to dtolnay/rust-toolchain@nightly + with: + # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds. + targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} + + - name: Rust cache + uses: swatinem/rust-cache@v2 + with: + workspaces: './src-tauri -> target' + - name: Create release uses: tauri-apps/tauri-action@v0 env: @@ -65,3 +71,4 @@ jobs: releaseBody: 'See the assets to download and install this version.' releaseDraft: true prerelease: false + args: ${{ matrix.args }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a79b0d7339e213e73a13d151b856fde3d4ce4e2..9b592cabca9b400e0ca00515d0a0095bcd18a43f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [2.5.1](https://github.com/HuLaSpark/HuLa/compare/v2.5.0...v2.5.1) (2024-10-29) + +### 🐛 Bug Fixes | Bug 修复 + +- **build:** :bug: 修复release配置导致打包的问题 ([4cd9a93](https://github.com/HuLaSpark/HuLa/commit/4cd9a9355d3c5cbd9101b709a839017c92538bfd)) +- **build:** :bug: 添加不同编译版本,以修复不同架构安装出错问题 ([19fb138](https://github.com/HuLaSpark/HuLa/commit/19fb138d51afd2884c1abd7fc62ae47762c2678b)) +- **global:** :bug: 修复艾特弹窗在mac下高度问题导致不显示 ([8a18e84](https://github.com/HuLaSpark/HuLa/commit/8a18e84ce781a7a987575ed9f27d2a8eff334bb6)) +- **layout:** :bug: 修复更新弹窗显示更新的内容 ([bd7f6fb](https://github.com/HuLaSpark/HuLa/commit/bd7f6fbe7f27e69275e54c776d761a1751289bf0)) +- **view:** :bug: 修复消息输入框部分bug ([24b8a51](https://github.com/HuLaSpark/HuLa/commit/24b8a517d85f5895ae66db64ac7d6d8ae547cad4)) + ## [2.5.0](https://github.com/HuLaSpark/HuLa/compare/v2.4.0...v2.5.0) (2024-10-27) ### ⚠ BREAKING CHANGES diff --git a/package.json b/package.json index 82d2763b13acefc0257614443866a7002340e028..befdbeed33624363c22ed1728fdbfddde0fa700e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "hula", "type": "module", - "version": "2.5.0", + "version": "2.5.1", "license": "Apache-2.0", "engines": { "node": ">=18.12.0", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 5b8efe23588f79d58a8cc5719709b1f4c45f4080..70c89c51afb26bfe635cf1c4734a5b7a08b8bef4 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,6 +1,6 @@ { "productName": "HuLa", - "version": "2.5.0", + "version": "2.5.1", "identifier": "com.tauri.build", "build": { "beforeDevCommand": "pnpm dev", diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index dc692035e36b05e544a3e7bd757078a19a917c51..d3eb5ae5cbe7c25b0c4f4fb25bd7fc1ca68df907 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -1,6 +1,6 @@ { "productName": "HuLa", - "version": "2.5.0", + "version": "2.5.1", "identifier": "com.tauri.build", "build": { "beforeDevCommand": "pnpm dev", diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index b583a389d9d45450172e6dd83f3184066bc8bfb9..9285c22d41a4dd4969c83425a73df5aac685767d 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -1,6 +1,6 @@ { "productName": "HuLa", - "version": "2.5.0", + "version": "2.5.1", "identifier": "com.tauri.build", "build": { "beforeDevCommand": "pnpm dev",