Skip to content

Commit

Permalink
Merge branch 'main' into prevent_from_displaying_cli_window
Browse files Browse the repository at this point in the history
  • Loading branch information
mmrrnn authored Nov 14, 2024
2 parents 73eeccd + 6102463 commit cf9d677
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:
jq '.tauri .bundle .windows += {"signCommand": "${{ env.WINDOWS_SIGN_COMMAND }}"}' > \
./tauri.windows.conf.json
cat ./tauri.windows.conf.json
cargo install trusted-signing-cli
cargo install trusted-signing-cli@0.3.0 --locked
- name: Install dependencies (node)
run: |
Expand Down
20 changes: 8 additions & 12 deletions .updater/beta-latest.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
{
"version": "0.1.0",
"version": "0.6.10",
"notes": "Tari Universe - See the assets to download this version and install",
"pub_date": "2024-10-01T10:21:09.614Z",
"pub_date": "2024-11-13T10:44:24.982Z",
"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": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOGEzYnpqbHBISHRRdGRUakdPY2plajdwR3JOZXdab2Q5LzlCNXM5KzNROFN6NVlYQm85ZnlyVTl2Mk41SHQ1WmI4MlE0YzVtNDhFaTdac1pNeHc1emdNPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxNDk0NDg3CWZpbGU6VGFyaSBVbml2ZXJzZV8wLjYuMTBfYW1kNjQuQXBwSW1hZ2UKOVZOT3R3eWttNzJoejZSNzVLRTNiTTRTWWFOMWc2VHNUVE1aREJoa3B4d0VpOEx6VnRLNlNlYXpmWWpTb2tnSWozN2dBWlEwK1dNTjZUTmJRbzBUREE9PQo=",
"url": "https://github.com/tari-project/universe/releases/download/v0.6.10/Tari.Universe_0.6.10_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": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFFFTmd2N2dhekdXMmE2Y3lkY1NCZWdyZzBlWWlyVWdySGFmM3VscTFpNzVjUi9KaXZxd3hjTFJibTBjcUZHd2xNc0ovRzMyd1dWVnRjT2lPL0pTN2dBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxNDk0NjUyCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6Cmc0c0ZnOWtWdnZwbER2cTlXTUhCUnp2UURLOEVJUXZZeHFrUFRBUnBWcC96dWtFK2ZGRVBiZzl3SjFoQzN6b2c2enpVaWFEWlljdXo2KzJHdVpoY0RnPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.6.10/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"
},
"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": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVRbUtvKzlyYWhiOFFFTmd2N2dhekdXMmE2Y3lkY1NCZWdyZzBlWWlyVWdySGFmM3VscTFpNzVjUi9KaXZxd3hjTFJibTBjcUZHd2xNc0ovRzMyd1dWVnRjT2lPL0pTN2dBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzMxNDk0NjUyCWZpbGU6VGFyaSBVbml2ZXJzZS5hcHAudGFyLmd6Cmc0c0ZnOWtWdnZwbER2cTlXTUhCUnp2UURLOEVJUXZZeHFrUFRBUnBWcC96dWtFK2ZGRVBiZzl3SjFoQzN6b2c2enpVaWFEWlljdXo2KzJHdVpoY0RnPT0K",
"url": "https://github.com/tari-project/universe/releases/download/v0.6.10/Tari.Universe_universal.app.tar.gz"
}
}
}
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.6.8",
"version": "0.6.14",
"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.6.8"
version = "0.6.14"

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

Expand Down
2 changes: 1 addition & 1 deletion src-tauri/binaries_versions_esmeralda.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"mmproxy": "=1.8.0-pre.0",
"minotari_node": "=1.8.0-pre.0",
"wallet": "=1.8.0-pre.0",
"sha-p2pool": "=0.7.6",
"sha-p2pool": "=0.7.10",
"xtrgpuminer": "=0.1.17",
"tor": "=13.5.7"
}
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/binaries_versions_nextnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"mmproxy": "=1.8.0-rc.0",
"minotari_node": "=1.8.0-rc.0",
"wallet": "=1.8.0-rc.0",
"sha-p2pool": "=0.7.6",
"sha-p2pool": "=0.7.10",
"xtrgpuminer": "=0.1.17",
"tor": "=13.5.7"
}
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "Tari Universe (Alpha)",
"version": "0.6.8"
"version": "0.6.14"
},
"tauri": {
"systemTray": {
Expand Down

0 comments on commit cf9d677

Please sign in to comment.