Skip to content

Commit

Permalink
Merge pull request #27 from Mario34/dev
Browse files Browse the repository at this point in the history
Release v1.1.1
  • Loading branch information
Mario34 committed Aug 24, 2023
2 parents 1924336 + b08b7b1 commit b93019f
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 5 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit b93019f

Please sign in to comment.