GRIN/grin-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix deps, do not run ci on grim branch

Browse Source
This commit is contained in:
ardocrat
2026-06-11 10:20:38 +03:00
parent a4db78fd53
commit 4d82108687
9 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yaml
+2
View File
@@ -1,5 +1,7 @@
name: Continuous Integration name: Continuous Integration
on: [push, pull_request] on: [push, pull_request]
branches-ignore:
- grim
jobs: jobs:
linux-tests: linux-tests:
Cargo.lock
Generated
-8
View File
@@ -1279,7 +1279,6 @@ dependencies = [
[[package]] [[package]]
name = "grin_api" name = "grin_api"
version = "5.4.0" version = "5.4.0"
source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f"
dependencies = [ dependencies = [
"async-stream", "async-stream",
"bytes 1.11.1", "bytes 1.11.1",
@@ -1313,7 +1312,6 @@ dependencies = [
[[package]] [[package]]
name = "grin_chain" name = "grin_chain"
version = "5.4.0" version = "5.4.0"
source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f"
dependencies = [ dependencies = [
"bit-vec", "bit-vec",
"bitflags 1.3.2", "bitflags 1.3.2",
@@ -1336,7 +1334,6 @@ dependencies = [
[[package]] [[package]]
name = "grin_core" name = "grin_core"
version = "5.4.0" version = "5.4.0"
source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@@ -1362,7 +1359,6 @@ dependencies = [
[[package]] [[package]]
name = "grin_keychain" name = "grin_keychain"
version = "5.4.0" version = "5.4.0"
source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"byteorder", "byteorder",
@@ -1384,7 +1380,6 @@ dependencies = [
[[package]] [[package]]
name = "grin_p2p" name = "grin_p2p"
version = "5.4.0" version = "5.4.0"
source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"built", "built",
@@ -1407,7 +1402,6 @@ dependencies = [
[[package]] [[package]]
name = "grin_pool" name = "grin_pool"
version = "5.4.0" version = "5.4.0"
source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f"
dependencies = [ dependencies = [
"blake2-rfc", "blake2-rfc",
"chrono", "chrono",
@@ -1439,7 +1433,6 @@ dependencies = [
[[package]] [[package]]
name = "grin_store" name = "grin_store"
version = "5.4.0" version = "5.4.0"
source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"croaring", "croaring",
@@ -1458,7 +1451,6 @@ dependencies = [
[[package]] [[package]]
name = "grin_util" name = "grin_util"
version = "5.4.0" version = "5.4.0"
source = "git+https://github.com/mimblewimble/grin?rev=cf2ed3f3becd62b5e754ec964fd90e332b9a021f#cf2ed3f3becd62b5e754ec964fd90e332b9a021f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"backtrace", "backtrace",
Cargo.toml
+11 -5
View File
@@ -54,10 +54,10 @@ grin_wallet_util = { path = "./util", version = "5.4.0-alpha.1" }
# grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # grin_api = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
# For bleeding edge # For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
# For local testing # For local testing
# grin_core = { path = "../grin/core"} # grin_core = { path = "../grin/core"}
@@ -65,7 +65,13 @@ grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62
# grin_util = { path = "../grin/util"} # grin_util = { path = "../grin/util"}
# grin_api = { path = "../grin/api"} # grin_api = { path = "../grin/api"}
###### # Grim monorepo
grin_core = { path = "../node/core"}
grin_keychain = { path = "../node/keychain"}
grin_util = { path = "../node/util"}
grin_api = { path = "../node/api"}
######
[build-dependencies] [build-dependencies]
built = { version = "0.8.0", features = ["git2"]} built = { version = "0.8.0", features = ["git2"]}
api/Cargo.toml
+8 -3
View File
@@ -41,15 +41,20 @@ grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
# For bleeding edge # For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
# For local testing # For local testing
# grin_core = { path = "../../grin/core"} # grin_core = { path = "../../grin/core"}
# grin_keychain = { path = "../../grin/keychain"} # grin_keychain = { path = "../../grin/keychain"}
# grin_util = { path = "../../grin/util"} # grin_util = { path = "../../grin/util"}
# Monorepo deps
grin_core = { path = "../../node/core"}
grin_keychain = { path = "../../node/keychain"}
grin_util = { path = "../../node/util"}
##### #####
[dev-dependencies] [dev-dependencies]
config/Cargo.toml
+6 -2
View File
@@ -30,13 +30,17 @@ grin_wallet_util = { path = "../util", version = "5.4.0-alpha.1" }
#grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } #grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
# For bleeding edge # For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
# For local testing # For local testing
# grin_core = { path = "../../grin/core"} # grin_core = { path = "../../grin/core"}
# grin_util = { path = "../../grin/util"} # grin_util = { path = "../../grin/util"}
# Monorepo deps
grin_core = { path = "../../node/core"}
grin_util = { path = "../../node/util"}
##### #####
[dev-dependencies] [dev-dependencies]
controller/Cargo.toml
+12 -5
View File
@@ -54,11 +54,11 @@ grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
# grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # grin_chain = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
# For bleeding edge # For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_chain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_chain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
# For local testing # For local testing
# grin_core = { path = "../../grin/core"} # grin_core = { path = "../../grin/core"}
@@ -67,6 +67,13 @@ grin_chain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd
# grin_api = { path = "../../grin/api"} # grin_api = { path = "../../grin/api"}
# grin_chain = { path = "../../grin/chain"} # grin_chain = { path = "../../grin/chain"}
# Monorepo deps
grin_core = { path = "../../node/core"}
grin_keychain = { path = "../../node/keychain"}
grin_util = { path = "../../node/util"}
grin_api = { path = "../../node/api"}
grin_chain = { path = "../../node/chain"}
##### #####
[dev-dependencies] [dev-dependencies]
impls/Cargo.toml
+14 -6
View File
@@ -60,12 +60,12 @@ grin_wallet_libwallet = { path = "../libwallet", version = "5.4.0-alpha.1" }
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
# For bleeding edge # For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_chain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_chain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_api = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
# For local testing # For local testing
# grin_core = { path = "../../grin/core"} # grin_core = { path = "../../grin/core"}
@@ -75,6 +75,14 @@ grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd
# grin_api = { path = "../../grin/api"} # grin_api = { path = "../../grin/api"}
# grin_store = { path = "../../grin/store"} # grin_store = { path = "../../grin/store"}
# Monorepo deps
grin_core = { path = "../../node/core"}
grin_keychain = { path = "../../node/keychain"}
grin_chain = { path = "../../node/chain"}
grin_util = { path = "../../node/util"}
grin_api = { path = "../../node/api"}
grin_store = { path = "../../node/store"}
##### #####
[dev-dependencies] [dev-dependencies]
libwallet/Cargo.toml
+10 -4
View File
@@ -59,10 +59,10 @@ grin_wallet_config = { path = "../config", version = "5.4.0-alpha.1" }
# grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # grin_store = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
# For bleeding edge # For bleeding edge
grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_core = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_keychain = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
# For local testing # For local testing
# grin_core = { path = "../../grin/core"} # grin_core = { path = "../../grin/core"}
@@ -70,4 +70,10 @@ grin_store = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd
# grin_util = { path = "../../grin/util"} # grin_util = { path = "../../grin/util"}
# grin_store = { path = "../../grin/store"} # grin_store = { path = "../../grin/store"}
# Monorepo deps
grin_core = { path = "../../node/core"}
grin_keychain = { path = "../../node/keychain"}
grin_util = { path = "../../node/util"}
grin_store = { path = "../../node/store"}
##### #####
util/Cargo.toml
+4 -1
View File
@@ -28,12 +28,15 @@ thiserror = "1"
# grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" } # grin_util = { git = "https://github.com/mimblewimble/grin", tag = "v5.2.0-beta.3" }
# For bleeding edge # For bleeding edge
grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" } #grin_util = { git = "https://github.com/mimblewimble/grin", rev = "cf2ed3f3becd62b5e754ec964fd90e332b9a021f" }
# For local testing # For local testing
# grin_util = { path = "../../grin/util"} # grin_util = { path = "../../grin/util"}
# Monorepo deps
grin_util = { path = "../../node/util"}
##### #####
[dev-dependencies] [dev-dependencies]