From e37971c501bade2393ba93e75d51c6ab1d1f17dd Mon Sep 17 00:00:00 2001 From: Guillem Cordoba Date: Sat, 7 May 2022 14:58:51 +0200 Subject: [PATCH] Lair workaround --- .github/workflows/release.yaml | 18 +++++++++--------- .github/workflows/test.yaml | 6 +++--- src-tauri/src/launcher/manager.rs | 1 - 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c1a1aba1..d40a529d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -46,15 +46,15 @@ jobs: $LkPath = Get-Command lair-keystore | Select-Object -ExpandProperty Definition Copy-Item $LkPath -Destination src-tauri/bins/lair-keystore-x86_64-pc-windows-msvc.exe - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 72ec17ea40cb3b4fcbbccc812394a959e47bb097 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev a60f227e75d510a2afc1914fdcedd6ebf754ea29 holochain $HcPath = Get-Command holochain | Select-Object -ExpandProperty Definition Copy-Item $HcPath -Destination src-tauri/bins/holochain-v0.0.127-x86_64-pc-windows-msvc.exe - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 78997dfdcfbdd37c23aae579673ee6e366885b51 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev daad7d1e704547d85a58ecd4ae94949b52b91166 holochain $HcPath = Get-Command holochain | Select-Object -ExpandProperty Definition Copy-Item $HcPath -Destination src-tauri/bins/holochain-v0.0.132-x86_64-pc-windows-msvc.exe - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 5ae2ea8cf58530f5abbc3f99521158a4ce5447d9 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 92f56b77d7914e99e4a2a600b372e960426af119 holochain $HcPath = Get-Command holochain | Select-Object -ExpandProperty Definition Copy-Item $HcPath -Destination src-tauri/bins/holochain-v0.0.136-x86_64-pc-windows-msvc.exe @@ -76,15 +76,15 @@ jobs: LAIR_PATH=$(which lair-keystore) cp $LAIR_PATH src-tauri/bins/lair-keystore-x86_64-apple-darwin - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 72ec17ea40cb3b4fcbbccc812394a959e47bb097 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev a60f227e75d510a2afc1914fdcedd6ebf754ea29 holochain HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.127-x86_64-apple-darwin - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 78997dfdcfbdd37c23aae579673ee6e366885b51 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev daad7d1e704547d85a58ecd4ae94949b52b91166 holochain HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.132-x86_64-apple-darwin - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 5ae2ea8cf58530f5abbc3f99521158a4ce5447d9 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 92f56b77d7914e99e4a2a600b372e960426af119 holochain HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.136-x86_64-apple-darwin @@ -116,15 +116,15 @@ jobs: LAIR_PATH=$(which lair-keystore) cp $LAIR_PATH src-tauri/bins/lair-keystore-x86_64-unknown-linux-gnu - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 72ec17ea40cb3b4fcbbccc812394a959e47bb097 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev a60f227e75d510a2afc1914fdcedd6ebf754ea29 holochain HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.127-x86_64-unknown-linux-gnu - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 78997dfdcfbdd37c23aae579673ee6e366885b51 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev daad7d1e704547d85a58ecd4ae94949b52b91166 holochain HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.132-x86_64-unknown-linux-gnu - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 5ae2ea8cf58530f5abbc3f99521158a4ce5447d9 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 92f56b77d7914e99e4a2a600b372e960426af119 holochain HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.136-x86_64-unknown-linux-gnu diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 97b2016b..57a1dbb5 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -46,15 +46,15 @@ jobs: CADDY_PATH=$(which caddy) cp $CADDY_PATH src-tauri/bins/caddy-x86_64-unknown-linux-gnu - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 72ec17ea40cb3b4fcbbccc812394a959e47bb097 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev a60f227e75d510a2afc1914fdcedd6ebf754ea29 holochain HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.127-x86_64-unknown-linux-gnu - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 78997dfdcfbdd37c23aae579673ee6e366885b51 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev daad7d1e704547d85a58ecd4ae94949b52b91166 holochain HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.132-x86_64-unknown-linux-gnu - cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 5ae2ea8cf58530f5abbc3f99521158a4ce5447d9 holochain + cargo install --locked --git https://github.com/guillemcordoba/holochain.git --rev 92f56b77d7914e99e4a2a600b372e960426af119 holochain HOLOCHAIN_PATH=$(which holochain) cp $HOLOCHAIN_PATH src-tauri/bins/holochain-v0.0.136-x86_64-unknown-linux-gnu diff --git a/src-tauri/src/launcher/manager.rs b/src-tauri/src/launcher/manager.rs index e2e01e77..09f5974f 100644 --- a/src-tauri/src/launcher/manager.rs +++ b/src-tauri/src/launcher/manager.rs @@ -8,7 +8,6 @@ use lair_keystore_manager::LairKeystoreManager; use serde::{Deserialize, Serialize}; use std::collections::HashMap; use std::path::Path; -use std::time::Duration; use sysinfo::{System, SystemExt}; use tauri::api::process::Command; use tauri::{window::WindowBuilder, AppHandle, Manager, WindowUrl};