diff --git a/.github/workflows/release-tauri-app.yaml b/.github/workflows/release-tauri-app.yaml index 4619435c..fc582639 100644 --- a/.github/workflows/release-tauri-app.yaml +++ b/.github/workflows/release-tauri-app.yaml @@ -263,7 +263,7 @@ jobs: - name: install Go stable uses: actions/setup-go@v4 with: - go-version: 1.21.1 + go-version: stable - name: Install and prepare run: | @@ -279,6 +279,11 @@ jobs: fileName: 'relay.happ' out-file-path: 'workdir/' + - name: Build rust deps to workaround https://github.com/tauri-apps/tauri/issues/11054 + run: | + cargo build --bins --features tauri/custom-protocol,tauri/native-tls --release + + - name: build the app uses: tauri-apps/tauri-action@v0 env: diff --git a/Cargo.lock b/Cargo.lock index 28aff8e2..9d2b4a4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9019,7 +9019,7 @@ dependencies = [ [[package]] name = "tauri-plugin-holochain" version = "0.0.0" -source = "git+https://github.com/darksoil-studio/p2p-shipyard?branch=develop#c0b6d060d27b69b995ef5a23a0cb622866fa62b8" +source = "git+https://github.com/darksoil-studio/p2p-shipyard?branch=main#bb00ec077b3453bfc09144c80bb4bedd7fb3ac06" dependencies = [ "anyhow", "async-std", diff --git a/package-lock.json b/package-lock.json index 4c8a8e37..9c1dbece 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ "@holochain-playground/cli": "^0.2.0", "@holochain/hc-spin": "^0.400.0-dev.3", "@rollup/plugin-typescript": "^8.0.0", - "@tauri-apps/cli": "^2.0.0-rc.10", + "@tauri-apps/cli": "^2.0.0-rc.16", "@tsconfig/svelte": "^5.0.4", "@types/dompurify": "^3.0.5", "@types/lodash-es": "^4.17.12", diff --git a/package.json b/package.json index f595326f..ef2cd3b5 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "@holochain-playground/cli": "^0.2.0", "@holochain/hc-spin": "^0.400.0-dev.3", "@rollup/plugin-typescript": "^8.0.0", - "@tauri-apps/cli": "^2.0.0-rc.10", + "@tauri-apps/cli": "^2.0.0-rc.16", "@tsconfig/svelte": "^5.0.4", "@types/dompurify": "^3.0.5", "@types/lodash-es": "^4.17.12", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 8d3e9edb..004354d0 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -19,8 +19,8 @@ tauri-build = { version = "2.0.0-rc", default-features = false , features = [] } [dependencies] tauri = { version = "2.0.0-rc", features = [] } -tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/p2p-shipyard", branch = "develop" } -holochain_types = { version = "0.3.1-rc" } +tauri-plugin-holochain = { git = "https://github.com/darksoil-studio/p2p-shipyard", branch = "main" } +holochain_types = { version = "0.3.2" } lair_keystore = { version = "0.4.0" } holochain_client = { version = "0.5.0" }