From 9a42e0beac796e2a1dcfe844b771f9fc466b7657 Mon Sep 17 00:00:00 2001 From: Mario34 Date: Thu, 24 Aug 2023 13:49:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?= =?UTF-8?q?ffmpeg=E6=96=87=E4=BB=B6=E4=B8=A2=E5=A4=B1execute=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 8 +++++--- src-tauri/Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f489d3a..929ed01 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,10 +65,12 @@ jobs: out-file-path: release-downloader - name: Init binaries - run: - cp -f "$GITHUB_WORKSPACE/release-downloader/ffmpeg" src-tauri/binaries/ffmpeg-aarch64-apple-darwin & - cp -f "$GITHUB_WORKSPACE/release-downloader/ffmpeg" src-tauri/binaries/ffmpeg-x86_64-apple-darwin & + run: | + chmod 777 "$GITHUB_WORKSPACE/release-downloader/ffmpeg" + cp -f "$GITHUB_WORKSPACE/release-downloader/ffmpeg" src-tauri/binaries/ffmpeg-aarch64-apple-darwin + cp -f "$GITHUB_WORKSPACE/release-downloader/ffmpeg" src-tauri/binaries/ffmpeg-x86_64-apple-darwin cp -f "$GITHUB_WORKSPACE/release-downloader/ffmpeg.exe" src-tauri/binaries/ffmpeg-x86_64-pc-windows-msvc.exe + ls -l src-tauri/binaries shell: bash - name: Build the app diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 9564ad3..979ee68 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -17,7 +17,7 @@ tauri-build = { version = "1.3.0", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.3.0", features = [ "dialog-message", "updater", "path-all", "fs-read-file", "fs-read-dir", "dialog-open", "notification-all", "shell-all", "protocol-all"] } +tauri = { version = "1.3.0", features = [ "dialog-message", "updater", "path-all", "fs-read-file", "fs-read-dir", "dialog-open", "notification-all", "shell-all", "protocol-all" ] } [features] # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled. From b08b7b1e908d168b77bb71b9f9c1f61c9cd43d88 Mon Sep 17 00:00:00 2001 From: Mario34 Date: Thu, 24 Aug 2023 14:41:12 +0800 Subject: [PATCH 2/2] chore(release): v1.1.1 --- CHANGELOG.md | 20 ++++++++++++++++++++ package.json | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7a5ed0..91bfbcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +## [1.1.1](https://github.com/Mario34/tesla-camera/compare/v1.0.0...v1.1.1) (2023-08-24) + + +### Bug Fixes + +* 修复打包ffmpeg文件丢失execute权限 ([9a42e0b](https://github.com/Mario34/tesla-camera/commit/9a42e0beac796e2a1dcfe844b771f9fc466b7657)) +* 图标风格统一 ([bf1c90a](https://github.com/Mario34/tesla-camera/commit/bf1c90aaf43d18c751abc5e6154d06e7fadea042)) + + +### Features + +* 添加检查更新功能 ([62f9b47](https://github.com/Mario34/tesla-camera/commit/62f9b472fb0513893f9b9de0dec4cef582b03a96)) + + +### Performance Improvements + +* 导出任务添加进度 ([b3d1e8b](https://github.com/Mario34/tesla-camera/commit/b3d1e8b80ab7622aeee345b09ce87787f0d5a772)), closes [closed#22](https://github.com/closed/issues/22) + + + # [1.1.0](https://github.com/Mario34/tesla-camera/compare/v1.0.0...v1.1.0) (2023-08-22) diff --git a/package.json b/package.json index 84dafe8..d0ec486 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tesla-camera", "private": true, - "version": "1.1.0", + "version": "1.1.1", "scripts": { "dev": "rspack serve -c ./rspack.config.dev.js", "build": "rspack build -c ./rspack.config.pro.js",