diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b43ed6..742c1ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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: diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 47c464d..975cdec 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3245,9 +3245,9 @@ dependencies = [ [[package]] name = "tauri" -version = "1.2.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b48820ee3bb6a5031a83b2b6e11f8630bdc5a2f68cb841ab8ebc7a15a916679" +checksum = "fe7e0f1d535e7cbbbab43c82be4fc992b84f9156c16c160955617e0260ebc449" dependencies = [ "anyhow", "attohttpc", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 78c9627..873b7d5 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -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" }