Skip to content

Commit

Permalink
chore: update version 0.8.23 (#1265)
Browse files Browse the repository at this point in the history
Description
---
fix auto-update loop
  • Loading branch information
brianp authored Dec 13, 2024
2 parents 35ab7e1 + ea91f74 commit bbef6d1
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 21 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@ jobs:
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v4

- name: BETA Builds - Install dependencies (windows) [yq]
if: ${{ startsWith(runner.os,'Windows') }}
run: |
choco upgrade yq -y
- name: BETA Builds - Install dependencies (linux) [yq]
if: ${{ startsWith(runner.os,'Linux') }}
shell: bash
Expand Down Expand Up @@ -80,6 +82,7 @@ jobs:
-i tauri.conf.json
cat tauri.conf.json
sed -i.bak -e "s/\"icons\//\"beta-icons\//g" tauri.conf.json
- name: RELEASE Builds - Set environment variables
if: ${{ startsWith(github.ref, 'refs/heads/release') }}
shell: bash
Expand All @@ -96,6 +99,7 @@ jobs:
yq eval ".productName = \"Tari Universe\"" -i tauri.conf.json
yq eval ".mainBinaryName = \"Tari Universe\"" -i tauri.conf.json
yq eval ".app.windows[0].title = \"Tari Universe | Testnet\"" -i tauri.conf.json
yq eval ".app.windows[1].title = \"Tari Universe | Testnet\"" -i tauri.conf.json
yq eval ".identifier = \"com.tari.universe\"" -i tauri.conf.json
yq eval ".plugins.updater.endpoints = [\"https://raw.githubusercontent.com/tari-project/universe/main/.updater/latest.json\", \"https://cdn-universe.tari.com/tari-project/universe/updater/latest.json\"]" \
-i tauri.conf.json
Expand Down Expand Up @@ -220,7 +224,7 @@ jobs:
artifactPaths: ${{ steps.build.outputs.artifactPaths }}
shell: bash
run: |
echo "Artifact paths:\n ${{ join(fromJSON(steps.build.outputs.artifactPaths), '\n') }}"
echo -e "Artifact paths: \n${{ join(fromJSON( env.artifactPaths ), '\n') }}"
- name: BETA Builds - Upload assets
if: ${{ ( github.event_name == 'schedule' ) || ( ! startsWith(github.ref, 'refs/heads/release') ) }}
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ src-tauri/gpu_status.json

# Sentry Config File
.env.sentry-build-plugin

# Ignore hosted auto updater json files
.updater/*.json
22 changes: 11 additions & 11 deletions .updater/alpha-latest.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"version": "0.1.0",
"version": "0.8.22",
"notes": "Tari Universe - See the assets to download this version and install",
"pub_date": "2024-10-01T10:21:09.614Z",
"pub_date": "2024-12-13T11:42:27.210Z",
"platforms": {
"linux-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGJtelJoWTkrQVpxS3NkRHZpaTgwaGc0K0ZleTEwb2RwQWlyNmRhRnNDaVBFMDI0OUhmUFEwNmtvV2dyRGRlOUlINmlERXlJNTduY2NpdU9XQytqWHdJPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3Nzc3MzY5CWZpbGU6dGFyaS11bml2ZXJzZV8wLjUuNl9hbWQ2NC5BcHBJbWFnZS50YXIuZ3oKZEN5ODMrREZycHlEaTZqN2pQM090Uk5lWHZkMnlEWXhYUFgwSDV2bjRuaVlGWHBzMW53WHFvYXY5b2ptSUUvUkUzU0IydXp2aHVGRWtKVUpscW9PQmc9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.5.6/tari-universe_0.5.6_amd64.AppImage.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFdIT05sQW1ERC9JaXJkK1NGZjNQSFVaMWpyQ1hTajlQVDM3TUpYV2RNY1hWb24xOGNJZ3IzckdYSmEwSWlHVWsyNmpidGZRMFArdlZPMUJDSG9ZbndBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDg5NTc4CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMjJfYW1kNjQuQXBwSW1hZ2UKajk0NlByVmVoeEdYYlpRN1ZNUEY2WmpqZmdESkEwYVdJa2ZwcU9WTFZzMkx0UzJsenluRmkwQmNDMkg3ak12TEEyNVFTNDNheTl0OU91MmNyMWc2Q1E9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.22/Tari.Universe_0.8.22_amd64.AppImage"
},
"darwin-aarch64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFZkV2ZmdG1ZSFE1WGFPWVVSUm5SOG1Nb0hpU2ZvckZzaStEZEtsWlQ4RVQwMWRCc1l0QTFjNVNpb2x4MnJVWmtZVVJqbDlaZHVCNTE1M2t3Wkg4MkFrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3Nzc3NTI3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CnRLU3NOT202VU5xQUNvUWgxVzRqNlNwZ3lKbUIxZ3I2Ukd2R3hianlRazcvU3docWllNmUxa01JUUNkcnUzeWxIK0xIN3RlQmJkdllCM05yTGswWUNnPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.5.6/Tari.Universe_universal.app.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGFpZkthZS9zWVdhTmJaSGoya3RMenZtMW0zd0dLZmZ4L0ZxMjdGY05IV2lXVUJoQXBBUzNKdkF3T3FjTVdBOTZZbnBqYjZ1M2NwSTdTQ2ZpaFl0elFNPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDg5ODk0CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CnJEYUxpZzBNT2QycjllVEh4bkR1YzZSYnpuQ3NXZWdha1pjbnk1cVVmMnUrdUpCa0dDUUcxSFlWMjllTnNuS0RJcGtQZGE0dVJ3TEhqT2lzU3U0V0RnPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.22/Tari.Universe_universal.app.tar.gz"
},
"darwin-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFZkV2ZmdG1ZSFE1WGFPWVVSUm5SOG1Nb0hpU2ZvckZzaStEZEtsWlQ4RVQwMWRCc1l0QTFjNVNpb2x4MnJVWmtZVVJqbDlaZHVCNTE1M2t3Wkg4MkFrPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3Nzc3NTI3CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CnRLU3NOT202VU5xQUNvUWgxVzRqNlNwZ3lKbUIxZ3I2Ukd2R3hianlRazcvU3docWllNmUxa01JUUNkcnUzeWxIK0xIN3RlQmJkdllCM05yTGswWUNnPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.5.6/Tari.Universe_universal.app.tar.gz"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGFpZkthZS9zWVdhTmJaSGoya3RMenZtMW0zd0dLZmZ4L0ZxMjdGY05IV2lXVUJoQXBBUzNKdkF3T3FjTVdBOTZZbnBqYjZ1M2NwSTdTQ2ZpaFl0elFNPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDg5ODk0CWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6CnJEYUxpZzBNT2QycjllVEh4bkR1YzZSYnpuQ3NXZWdha1pjbnk1cVVmMnUrdUpCa0dDUUcxSFlWMjllTnNuS0RJcGtQZGE0dVJ3TEhqT2lzU3U0V0RnPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.22/Tari.Universe_universal.app.tar.gz"
},
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGY5RHBGU0lPVC9vL092TzF2Z1hPNEkwUnltVEJabW1JWGpwUi9EaFN6WkJydW9HMXFQQlVGYit5dmhMemQzOXA1V3BPQlNsaEpvNEl5bnhqangwS2dFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzI3Nzc4MDY2CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjUuNl94NjRfZW4tVVMubXNpLnppcApobm4yNGM2VDhlUjRibnl0THpZTEl1ajhzQm54dllwLzcxbzNVeU5UU2FmSXVpTVlCUmNrWWdZUDN6QjhVWVhDZGcrVDB2ekZPemFLdGFVOXNYMW5Cdz09Cg==",
"url": "https://github.com/tari-project/universe/releases/download/v0.5.6/Tari.Universe_0.5.6_x64_en-US.msi.zip"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGY2L1JKUEFwTS84RjlvWUFDM0JqcWtqZDJmTE1jZW5XanpVb2Y0SmRTS09Rb2JpMW1mZWJZYjRobWJNMTZrU01mN3lnYnNuUUJVdnRqWXpzV0xMOXdvPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzM0MDkwMTQwCWZpbGU6VGFyaSBVbml2ZXJzZV8wLjguMjJfeDY0X2VuLVVTLm1zaS56aXAKVUFmbnd0R2daVG40WlQ3dnUwYnpYRllrTkNMNUhDYUlMTUxLUndVMFh3eFRGb3V6R2ZKMnIzdkFUWmIxWEk3dFZLYVZEYXF6Mzg5K25CU1JFb0hmQ0E9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.8.22/Tari.Universe_0.8.22_x64_en-US.msi.zip"
}
}
}
}
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "tari-universe",
"private": true,
"version": "0.8.22",
"version": "0.8.23",
"type": "module",
"scripts": {
"dev": "vite dev --mode development",
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -4,7 +4,7 @@ description = "Tari Universe"
edition = "2021"
name = "tari-universe"
repository = "https://github.com/tari-project/universe"
version = "0.8.22"
version = "0.8.23"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
1 change: 1 addition & 0 deletions src-tauri/src/p2pool/models.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ pub struct Stats {
pub connected_since: Option<EpochTime>,
pub randomx_stats: ChainStats,
pub sha3x_stats: ChainStats,
pub last_gossip_message: EpochTime,
}

#[derive(Debug, Serialize, Deserialize, Clone)]
Expand Down
26 changes: 25 additions & 1 deletion src-tauri/src/p2pool_adapter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ use crate::process_adapter::HealthStatus;
use crate::process_adapter::ProcessStartupSpec;
use crate::process_adapter::{ProcessAdapter, ProcessInstance, StatusMonitor};
use crate::utils::file_utils::convert_to_string;
use tari_utilities::epoch_time::EpochTime;

#[cfg(target_os = "windows")]
use crate::utils::setup_utils::setup_utils::add_firewall_rule;
Expand Down Expand Up @@ -163,7 +164,30 @@ impl P2poolStatusMonitor {
impl StatusMonitor for P2poolStatusMonitor {
async fn check_health(&self) -> HealthStatus {
match self.stats_client.stats().await {
Ok(_) => HealthStatus::Healthy,
Ok(stats) => {
if stats
.connection_info
.network_info
.connection_counters
.established_outgoing
+ stats
.connection_info
.network_info
.connection_counters
.established_incoming
< 1
{
warn!(target: LOG_TARGET, "P2pool has no connections, health check warning");
return HealthStatus::Warning;
}

if EpochTime::now().as_u64() - stats.last_gossip_message.as_u64() > 60 {
warn!(target: LOG_TARGET, "P2pool last gossip message was more than 60 seconds ago, health check warning");
return HealthStatus::Warning;
}

HealthStatus::Healthy
}
Err(e) => {
warn!(target: LOG_TARGET, "P2pool health check failed: {}", e);
HealthStatus::Unhealthy
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/src/updates_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@ impl UpdatesManager {
}
},
|| {
app.restart();
info!(target: LOG_TARGET, "Latest version download finished");
},
)
.await?;

Ok(())
app.restart();
}
}
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.8.22",
"version": "0.8.23",
"productName": "Tari Universe (Alpha)",
"mainBinaryName": "Tari Universe (Alpha)",
"identifier": "com.tari.universe.alpha",
Expand Down

0 comments on commit bbef6d1

Please sign in to comment.