Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump tauri from 1.2.3 to 1.2.4 in /src-tauri #122

Merged
merged 3 commits into from
Jan 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,27 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y libdbus-1-3 libdbus-1-dev libxi-dev libxtst-dev libgles2-mesa-dev libgtk-3-dev \
libwebkit2gtk-4.0-dev librsvg2-dev
libwebkit2gtk-4.0-dev librsvg2-dev jq
if: runner.os == 'Linux'

- name: Install Windows System Dependencies
run: choco install -y wget
run: choco install -y wget jq
if: runner.os == 'Windows'

- name: Install MacOS System Dependencies
run: brew install jq
if: runner.os == 'macOS'

- uses: actions/checkout@v3
with:
submodules: true

- name: Disable Signing if not on main
# Private key not available otherwise
if: github.ref != 'refs/heads/main'
run: jq '.tauri.updater.active = false' src-tauri/tauri.conf.json > src-tauri/tauri.conf.json.tmp && mv src-tauri/tauri.conf.json.tmp src-tauri/tauri.conf.json


- name: Setup node
uses: actions/setup-node@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/Cargo.lock

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

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tauri-build = { version = "1.2.1", features = [] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tauri = { version = "1.2.3", features = ["api-all", "updater"] }
tauri = { version = "1.2.4", features = ["api-all", "updater"] }
pathdiff = "0.2.1"
csv = "1.1.6"
opencv-yolov5 = { git = "https://github.com/bencevans/rust-opencv-yolov5", rev = "03695538d52864d93908ad32f8956479e538a5e9" }
Expand Down