diff --git a/.github/workflows/release-mac.yaml b/.github/workflows/release-mac.yaml index 44634f9c..a9860627 100644 --- a/.github/workflows/release-mac.yaml +++ b/.github/workflows/release-mac.yaml @@ -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 diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 2d6618f4..089a31f7 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -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" @@ -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 \ No newline at end of file +# strip = true # strip debug and symbols for size diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs index 5cb0c244..4169960f 100644 --- a/src-tauri/src/commands/mod.rs +++ b/src-tauri/src/commands/mod.rs @@ -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::*; diff --git a/src-tauri/tauri.conf.canary.json b/src-tauri/tauri.conf.canary.json index 9d451774..366dbbf0 100644 --- a/src-tauri/tauri.conf.canary.json +++ b/src-tauri/tauri.conf.canary.json @@ -1,7 +1,7 @@ { "package": { "productName": "carpe-canary", - "version": "1.0.0-15" + "version": "1.0.0" }, "build": { "distDir": "../dist", diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index b2719589..ec527047 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "package": { "productName": "carpe", - "version": "1.0.0-15" + "version": "1.0.0" }, "build": { "distDir": "../dist",