Skip to content

Commit

Permalink
Canary 1.0.0-16 -> Release 1.0.0 (#178)
Browse files Browse the repository at this point in the history
* trigger ci

* cleanup settings. moves wallet actions to main wallet view

* minimal layout on table, add account info and settings view

* update diem upstream

* can submit slow wallet transactions

* don't offer to migrate accounts

* update libra-framework version to 6.9.3

* bump version

* account switcher debounce

* merge canary debugging changes

Squashed commit of the following:

commit 1273155
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Sun Jan 7 13:56:17 2024 -0500

    autoupdater payload [skip ci]

commit 8add6ca
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Sun Jan 7 13:50:37 2024 -0500

    bump version

commit acf6875
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Thu Jan 4 15:41:22 2024 -0500

    update pub keys

commit 44e491a
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Wed Jan 3 17:11:04 2024 -0500

    patch up [skip ci]

commit 653d1a5
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Wed Jan 3 16:03:31 2024 -0500

    update workflow

commit cfdd804
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Wed Jan 3 15:59:49 2024 -0500

    update urls and public keys

commit 9b52d15
Author: 0o-de-lally <>
Date:   Wed Jan 3 15:27:27 2024 -0500

    lint

commit 002f7c8
Author: 0o-de-lally <>
Date:   Wed Jan 3 15:24:56 2024 -0500

    remove debug prints

commit ee24bc8
Author: 0o-de-lally <>
Date:   Wed Jan 3 14:33:01 2024 -0500

    updater progress steps

commit d7f5047
Author: 0o-de-lally <>
Date:   Wed Jan 3 13:50:40 2024 -0500

    update testing keys

commit fa4c5b4
Merge: 73ff181 c4c855b
Author: 0o-de-lally <>
Date:   Sat Dec 9 15:27:55 2023 -0500

    Merge branch 'upgrade-ui' into canary-upgrades

commit c4c855b
Author: 0o-de-lally <>
Date:   Sat Dec 9 15:27:36 2023 -0500

    fix ts build error

commit 73ff181
Author: 0o-de-lally <>
Date:   Sat Dec 9 15:11:56 2023 -0500

    try building release

commit a1cfdc1
Author: 0o-de-lally <>
Date:   Sat Dec 9 14:55:42 2023 -0500

    update card

commit 332211c
Author: 0o-de-lally <>
Date:   Wed Dec 6 20:27:12 2023 -0500

    ui for updater

commit cf54e63
Author: 0o-de-lally <>
Date:   Wed Dec 6 17:00:01 2023 -0500

    rebuild rc.11 to test upgrade

commit f44a8bd
Author: 0o-de-lally <>
Date:   Wed Dec 6 16:49:02 2023 -0500

    try add aarch 64 [skip ci]

commit 9e3298a
Author: 0o-de-lally <>
Date:   Wed Dec 6 16:43:33 2023 -0500

    add signature field to win [skip-ci]

commit c344704
Author: 0o-de-lally <>
Date:   Wed Dec 6 16:39:19 2023 -0500

    add signature to v12 updater

commit 0b5f53e
Author: 0o-de-lally <>
Date:   Wed Dec 6 16:18:03 2023 -0500

    test updater manifest at rc.12

commit fbca777
Author: 0o-de-lally <>
Date:   Wed Dec 6 16:07:12 2023 -0500

    noop rc.12 build to test upgrade

commit a7ca8c0
Author: 0o-de-lally <>
Date:   Wed Dec 6 16:06:46 2023 -0500

    force rc.11 build. old tauri keys

commit 8829b0e
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Wed Dec 6 15:23:35 2023 -0500

    Update autoupdater_payload_canary.json

commit 7703ba2
Author: 0o-de-lally <>
Date:   Tue Dec 5 15:51:12 2023 -0500

    build rc 11

commit 7188814
Author: 0o-de-lally <>
Date:   Tue Dec 5 15:50:08 2023 -0500

    build rc 10

commit 271903f
Author: 0o-de-lally <>
Date:   Tue Dec 5 15:48:37 2023 -0500

    patch updater

commit 6b45edf
Author: 0o-de-lally <>
Date:   Tue Dec 5 13:49:58 2023 -0500

    clippy

commit a620dfe
Author: 0o-de-lally <>
Date:   Tue Dec 5 13:49:41 2023 -0500

    cargo fmt

commit 41a6a26
Merge: b21f208 82c09ad
Author: 0o-de-lally <>
Date:   Tue Dec 5 13:19:15 2023 -0500

    Merge branch 'check-keyring' into canary

commit b21f208
Merge: 4c969be 217a329
Author: 0o-de-lally <>
Date:   Tue Dec 5 13:18:25 2023 -0500

    Merge branch 'progress-bar-bug' into canary

commit 217a329
Author: 0o-de-lally <>
Date:   Tue Dec 5 13:18:11 2023 -0500

    clean

commit 9d87fb8
Author: 0o-de-lally <>
Date:   Tue Dec 5 13:16:40 2023 -0500

    responsive miner toggle

commit 82c09ad
Author: 0o-de-lally <>
Date:   Tue Dec 5 13:16:40 2023 -0500

    responsive miner toggle

commit cdb5b9a
Author: 0o-de-lally <>
Date:   Tue Dec 5 12:59:31 2023 -0500

    use backwards compatible account address format for OS keyring

commit 9ab748a
Author: 0o-de-lally <>
Date:   Tue Dec 5 12:58:01 2023 -0500

    Squashed commit of the following:

    commit 9cf0768
    Author: 0o-de-lally <>
    Date:   Tue Dec 5 12:31:58 2023 -0500

        extra attempt to parse v5 address on transfer

    commit 37d60eb
    Author: 0o-de-lally <>
    Date:   Tue Dec 5 12:04:29 2023 -0500

        update dep: keyring

    commit 51d0934
    Author: 0o-de-lally <>
    Date:   Tue Dec 5 11:40:38 2023 -0500

        miner progress bar FML

    commit 086bc5e
    Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
    Date:   Sat Dec 2 20:12:22 2023 -0500

        lint

    commit e51ea6d
    Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
    Date:   Sat Dec 2 20:11:24 2023 -0500

        don't destroy miner interval when leaving miner page

commit 9cf0768
Author: 0o-de-lally <>
Date:   Tue Dec 5 12:31:58 2023 -0500

    extra attempt to parse v5 address on transfer

commit 4c969be
Merge: 3c0b70c 37d60eb
Author: 0o-de-lally <>
Date:   Tue Dec 5 12:09:41 2023 -0500

    Merge branch 'progress-bar-bug' into canary

commit 37d60eb
Author: 0o-de-lally <>
Date:   Tue Dec 5 12:04:29 2023 -0500

    update dep: keyring

commit 51d0934
Author: 0o-de-lally <>
Date:   Tue Dec 5 11:40:38 2023 -0500

    miner progress bar FML

commit 3c0b70c
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Sat Dec 2 21:59:49 2023 -0500

    test canary updater

commit ed1aa00
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Sat Dec 2 20:22:52 2023 -0500

    patch canary upgrade URL

commit 086bc5e
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Sat Dec 2 20:12:22 2023 -0500

    lint

commit e51ea6d
Author: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Date:   Sat Dec 2 20:11:24 2023 -0500

    don't destroy miner interval when leaving miner page

* fmt

* trigger build

* patch and bump version

* use libra 6.9.4

* checking for slow wallets before giving option to set slow.

* bump version

* patch

* dont prebuild rust

* remove libra-cached-packages which might need libssl

* nit

* conceal slow wallet button in accordion

* try adding openssl

* try adding libssl dylib to distribution

* close panel when changing account

* add more libs

* try libra 7adbda6 removing unused dependencies

* bump version to 1.0.0

* bump to rc 16

* Fix build, poem pinned versions

* Update release-mac.yaml

Change to macos-11

* Update release-mac.yaml

* Update release-mac.yaml

---------

Co-authored-by: 0o-de-lally <1364012+0o-de-lally@users.noreply.github.com>
Co-authored-by: 0o-de-lally <>
  • Loading branch information
kalvkusk and 0o-de-lally authored Jan 21, 2024
1 parent 0c9abd6 commit 7a7ed9f
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 8 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/release-mac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,25 @@ jobs:
- name: checkout source
uses: actions/checkout@v3

##### Cache ########

- uses: Swatinem/rust-cache@v2.7.3
with:
workspaces: src-tauri
shared-key: "macos-11"
cache-all-crates: true
cache-on-failure: true



######## BUILD ########

- name: yarn installation
run: yarn install

# - name: pre-build rust
# working-directory: ./src-tauri
# run: cargo b --release
- name: pre-build rust
working-directory: ./src-tauri
run: cargo b --release

- name: Build Tauri
uses: tauri-apps/tauri-action@v0
Expand Down
8 changes: 7 additions & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ libra-types = { git = "https://github.com/0LNetworkCommunity/libra-framework", r
libra-txs = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "da8bcdb4" }
libra-wallet = { git = "https://github.com/0LNetworkCommunity/libra-framework", rev = "da8bcdb4" }

# without these pinned versions, poem-openapi-types fail
poem = { version = "=1.3.55", features = ["anyhow", "rustls"] }
poem-openapi = { version = "=2.0.11", features = ["swagger-ui", "url"] }
poem-openapi-derive = "=2.0.11"


# shared with libra-framework and diem
anyhow = "1.0.62"
futures = "= 0.3.24"
Expand Down Expand Up @@ -61,4 +67,4 @@ serde_yaml = "0.8.24"
# codegen-units = 1 # Reduce number of codegen units to increase optimizations.
# panic = 'abort' # Abort on panic
# debug = false # remove debug on compile
# strip = true # strip debug and symbols for size
# strip = true # strip debug and symbols for size
2 changes: 1 addition & 1 deletion src-tauri/src/commands/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ pub(crate) mod tx;
pub(crate) mod wallets;
pub(crate) mod web_logs;

pub use app_version::*;
//pub use app_version::*;
2 changes: 1 addition & 1 deletion 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.0-15"
"version": "1.0.0"
},
"build": {
"distDir": "../dist",
Expand Down
2 changes: 1 addition & 1 deletion 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.0-15"
"version": "1.0.0"
},
"build": {
"distDir": "../dist",
Expand Down

0 comments on commit 7a7ed9f

Please sign in to comment.