Skip to content

Commit

Permalink
Merge branch '0LNetworkCommunity:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
BBK912 authored Mar 3, 2024
2 parents bd623d0 + 65c2cb7 commit 4d5fa79
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 38 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ name: build

on:
workflow_dispatch:
push:
tags:
- '*'
branches:
- '*'
pull_request:
types:
- opened
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: lint

on:
push:
tags:
- '*'
branches:
- '*'
pull_request:
types:
- opened
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

Currently Windows and Mac are supported:

- [Download Windows 10+](https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.0/carpe_1.0.0_x64_en-US.msi) and read the [Windows instructions](docs/start-carpe-windows.md)
- [Download Windows 10+](https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.2/carpe_1.0.2_x64_en-US.msi) and read the [Windows instructions](docs/start-carpe-windows.md)

- [Download MacOs 11+](https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.0/carpe_1.0.0_x64.dmg) and read the [Mac instructions](docs/start-carpe-mac.md)
- [Download MacOs 11+](https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.2/carpe_1.0.2_x64.dmg) and read the [Mac instructions](docs/start-carpe-mac.md)

On Windows, currently, Microsoft Edge WebView2 must be installed manually first.
https://developer.microsoft.com/en-us/microsoft-edge/webview2/consumer
Expand Down
18 changes: 9 additions & 9 deletions autoupdater/autoupdater_payload.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"version": "1.0.1",
"notes": "Multiple UI fixes, Chain autoconnect enabled",
"pub_date": "2024-02-17T22:57:15.333Z",
"version": "1.0.2",
"notes": "Bugfixes",
"pub_date": "2024-03-01T14:57:15.333Z",
"platforms": {
"darwin-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSb2t0YlhzSHBEbHZDRzV2QUVraUIzSldtQmhZTFlyNTBEVU04cDJOQzl5UG9JdGhQeE42L3RJa0VBOEJudjk2NVhhaHBLeVRZbndBVnpYL2JwWUxTK3llbE9obmRoR1FZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzA4MjA5OTIzCWZpbGU6Y2FycGUuYXBwLnRhci5negowRHBQODllTGdjZW5EY2dlM05ZVHRTdnFNT2V2dmVxdDlXb0xlYjFTYWFyQTFmcGp6b2NxM2xVc1VRc3hYOUdranUwN0tzd1RBSE84dUxUMmlFaVZDQT09Cg==",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.1/carpe_x64.app.tar.gz"
},
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSb2t0YlhzSHBEbGx0TEVtaThOdko4TFoxZXZleTBSODFoNzh6bUNZM3A1RWVmK0JRc2c3ZHJIRnNYSmpVYmJWZ0hmYjk5OVZGMUkrMTM0U1N3SkZRKyt1VnIzbW0wY1F3PQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzA4MjEwNjMwCWZpbGU6Y2FycGVfMS4wLjFfeDY0X2VuLVVTLm1zaS56aXAKMWZ0eW85Z3BEUmF5VEFwVnc0TXJBR1JPMjVLRlVJUHlkV3hCenRpaVVHNjFnbDRYWkxwUHJUUStoTVpqWTZZcllUYXBLdnduZzQxNzU3TUhsV211Q2c9PQo=",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.1/carpe_1.0.1_x64_en-US.msi.zip"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSb2t0YlhzSHBEbHNzWWFVS2lIRnZLSm0vR3lCbENEbWN0OTVxaUNjQU5sR0h5NmtPWlRrOXVLY2lpcDBmK05Rd2lxL3hnRktFRk5meWtkT0piWDZET2FTRG1GZmg3SWdBPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzA5MzI3MTM0CWZpbGU6Y2FycGVfMS4wLjNfeDY0X2VuLVVTLm1zaS56aXAKUmExU1loczF5aktVTldOZUJzVEJlY2VxVDUyNUx1WCsycjN5ODNpUXU3REZqSTMyOGRpSEllenJPYWNTVyt2MHRHRlNxSk5BNGNTc09ZOHNtNllaQkE9PQo=",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.3/carpe_1.0.3_x64_en-US.msi.zip"
},
"darwin-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSb2t0YlhzSHBEbHA2ZDBMbFEydzIvNGRFUWQ5bE1VZW5rOG5PL0s5NkEvenBGbE8xRytKVVU0N1loT1lCc2hYdE12RTlXcGZwTWh6aVU3alNDTnJMeDdIcWlqZFVLL2dVPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzA5MzI5MzQxCWZpbGU6Y2FycGUuYXBwLnRhci5negpmODBJRjRGbC8raE9DYmUzenU0amZZbUptNmpRNk5JWmtzNVB2L3FIcjZnYjQwVDQ5ZSt0dGhpZDhlQTY2eTh1dzFINHEybFh2SHBZbFBlQWIxQkNCUT09Cg==",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.3/carpe_x64.app.tar.gz"
}
}
}
18 changes: 7 additions & 11 deletions autoupdater/autoupdater_payload_canary.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
{
"version": "v1.0.0-12",
"version": "v1.0.1-3",
"notes": "canary",
"pub_date": "2023-12-02T00:00:00Z",
"platforms": {
"darwin-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSZWdQTTVlRE1MMkJJWWZJM0xXdkhVa1o2YmROdFNwQ2JxRkJaeVFpU1AvcHlCRlArclp1Q2I4VDZuK2FsSmFaei9wYS9GOTFzNnV5U1k2M1cwa0dabVpxdE1RajJ2SGdVPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzAxODk3MTgyCWZpbGU6Y2FycGUtY2FuYXJ5LmFwcC50YXIuZ3oKWEpXK2tBVDZsbE9hOGEwUXB0cDR5eTlyQ0w3MlZ2YmNpOXlOb3FNcGdqdzVuN090TElhNXd6ZXViUFFDcDBWK2lRYTRKayswZkpDcVNaeWxTRC9pQVE9PQo=",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.0-12-canary/carpe-canary_1.0.0-12_x64.dmg"
},
"darwin-aarch64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSZWdQTTVlRE1MMkJJWWZJM0xXdkhVa1o2YmROdFNwQ2JxRkJaeVFpU1AvcHlCRlArclp1Q2I4VDZuK2FsSmFaei9wYS9GOTFzNnV5U1k2M1cwa0dabVpxdE1RajJ2SGdVPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzAxODk3MTgyCWZpbGU6Y2FycGUtY2FuYXJ5LmFwcC50YXIuZ3oKWEpXK2tBVDZsbE9hOGEwUXB0cDR5eTlyQ0w3MlZ2YmNpOXlOb3FNcGdqdzVuN090TElhNXd6ZXViUFFDcDBWK2lRYTRKayswZkpDcVNaeWxTRC9pQVE9PQo=",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.0-12-canary/carpe-canary_1.0.0-12_x64.dmg"
},
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSZWdQTTVlRE1MMkZyeTRsbVlXdVBzOVdXc2RIdnF0VGNtZHFGRTNubHJEdGdUYUhMbGMvTmFKUkd1eVdnTjFmUm9NZUExM3VhNDlraTZESGFCc1UxU2RqR2E3SUZyMndNPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzAxODk3NjYwCWZpbGU6Y2FycGUtY2FuYXJ5XzEuMC4wLTEyX3g2NC1zZXR1cC5uc2lzLnppcApVRUE1Uk9abVdvbTN6Q3JhNGdCQlIwMk5XVWR0aTRUNUJEbGFsMFBDdnE1SUYvNytWZTZoK0VLeENyYzdjTnd1WEVvZmgwL3VmSlhha1JpUDF3RC9Ddz09Cg==",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.0-11-canary/carpe-canary_1.0.0-11_x64-setup.nsis.zip"
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSb2t0YlhzSHBEbHFHV0Z5Z1ViTnFROUk0d2NYY1Ewck9NaTZpYjNGSmxTRUJCQjJmVU9XOVdSTHNLbjNlT09lYklOdmxHTmFINjlSRmRqamp0dEJSVDNNZTNnQWdORUFjPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzA5Mjk3NzY3CWZpbGU6Y2FycGUtY2FuYXJ5XzEuMC4xLjNfeDY0X2VuLVVTLm1zaS56aXAKa1Mxa054dVlBTDFIRUY2cE9kVVVtOU9Bcm9BL2RWY3hUU0ZTOEUwS2JXWmN1OTd5MDZjRCt5aHNNeXFoUVRGQVFKWnBCaUpSVkp0dTB2elVhSEpPRGc9PQo=",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.1-3-canary/carpe-canary_1.0.1.3_x64_en-US.msi.zip"
},
"darwin-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSb2t0YlhzSHBEbGxGRXllcE1HQlBpRlM0K0Q4Ym9IQnhSV1huMzZYYithbTlla0RGM3hmOFE3Q09hVjZFUkZmVlo1VEJtcXI4NGV3SEpRanlJbDF3NUtuZytNVVRaUEFnPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzA5Mjk3ODg2CWZpbGU6Y2FycGUtY2FuYXJ5LmFwcC50YXIuZ3oKVUd3WG02RWgxMHlEYU92QWdHYUhmWlBnVjBEckx5Rnk1aWV2K3J3dHlVb0g4d3RzSktsU3p2b2ZieThUUkpCSFNWcWlIMEVacWZETlh2TlgwNjZ0QWc9PQo=",
"url": "https://github.com/0LNetworkCommunity/carpe/releases/download/v1.0.1-3-canary/carpe-canary_x64.app.tar.gz"
}
}
}
2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "carpe"
version = "1.0.0"
version = "1.0.2"
authors = ["0LNetworkCommunity"]
default-run = "carpe"
description = "a light miner and wallet for libra"
Expand Down
Binary file added src-tauri/msvcp140.dll
Binary file not shown.
6 changes: 4 additions & 2 deletions src-tauri/tauri.conf.canary.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"package": {
"productName": "carpe-canary",
"version": "1.0.1-2"
"version": "1.0.1-3"
},
"build": {
"distDir": "../dist",
Expand Down Expand Up @@ -36,7 +36,9 @@
"libcrypto.dylib",
"libcrypto.3.dylib",
"libssl.dylib",
"libssl.3.dylib"
"libssl.3.dylib",
"msvcp140.dll",
"vcruntime140.dll"
],
"externalBin": [],
"copyright": "",
Expand Down
6 changes: 4 additions & 2 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"package": {
"productName": "carpe",
"version": "1.0.1"
"version": "1.0.2"
},
"build": {
"distDir": "../dist",
Expand Down Expand Up @@ -36,7 +36,9 @@
"libcrypto.dylib",
"libcrypto.3.dylib",
"libssl.dylib",
"libssl.3.dylib"
"libssl.3.dylib",
"msvcp140.dll",
"vcruntime140.dll"
],
"externalBin": [],
"copyright": "",
Expand Down
4 changes: 3 additions & 1 deletion src-tauri/tauri.conf.pr.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@
"libcrypto.dylib",
"libcrypto.3.dylib",
"libssl.dylib",
"libssl.3.dylib"
"libssl.3.dylib",
"msvcp140.dll",
"vcruntime140.dll"
],
"externalBin": [],
"copyright": "",
Expand Down
Binary file added src-tauri/vcruntime140.dll
Binary file not shown.

0 comments on commit 4d5fa79

Please sign in to comment.