Skip to content

Commit

Permalink
Merge pull request #217 from TheWaWaR/update-ckb-to-v0.26.1
Browse files Browse the repository at this point in the history 
chore: Update ckb dependency to v0.26.1
  • Loading branch information
@TheWaWaR
TheWaWaR authored Dec 23, 2019
2 parents 5fe954f + 394b18d commit 5a9905d
Show file tree
Hide file tree
Showing 7 changed files with 168 additions and 171 deletions.
273 changes: 133 additions & 140 deletions Cargo.lock
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
[package]
name = "ckb-cli"
version = "0.26.0"
version = "0.26.1"
license = "MIT"
authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
edition = "2018"

[dependencies]
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2", features = ["secp"] }
ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1", features = ["secp"] }
ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-sdk = { path = "ckb-sdk" }
ckb-index = { path = "ckb-index" }
ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }

jsonrpc-client-core = "0.5.0"
secp256k1 = {version = "0.15.0" }
Expand Down Expand Up @@ -48,7 +48,7 @@ tui = "0.6.0"
termion = "1.5"

[build-dependencies]
ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }

[workspace]
members = ["ckb-sdk", "ckb-index", "ckb-sdk-types"]
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ci: fmt clippy test security-audit
git diff --exit-code Cargo.lock

integration:
bash devtools/ci/integration.sh v0.25.1
bash devtools/ci/integration.sh v0.26.1-rc1

prod: ## Build binary with release profile.
cargo build --release
Expand Down
4 changes: 2 additions & 2 deletions ckb-index/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-index"
version = "0.26.0"
version = "0.26.1"
authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
edition = "2018"
license = "MIT"
Expand All @@ -11,7 +11,7 @@ serde_derive = "1.0"
bincode = "1.1.4"
log = "0.4.6"
failure = "0.1.5"
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-sdk = { path = "../ckb-sdk" }

[dependencies.rocksdb]
Expand Down
14 changes: 7 additions & 7 deletions ckb-sdk-types/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-sdk-types"
version = "0.26.0"
version = "0.26.1"
authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
edition = "2018"
license = "MIT"
Expand All @@ -9,14 +9,14 @@ license = "MIT"
serde = { version = "1.0", features = ["rc"] }
serde_derive = "1.0"

ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2", default-features = false }
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1", default-features = false }
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-error = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }

[dev-dependencies]
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2", features = ["secp"] }
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1", features = ["secp"] }

[features]
default = ["ckb-script/default"]
Expand Down
14 changes: 7 additions & 7 deletions ckb-sdk/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "ckb-sdk"
version = "0.26.0"
version = "0.26.1"
authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
edition = "2018"
license = "MIT"
Expand All @@ -27,10 +27,10 @@ chrono = "0.4.6"
failure = "0.1.5"
lazy_static = "1.4.0"

ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2" }
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.0-rc2", features = ["secp"] }
ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-script = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1" }
ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.26.1-rc1", features = ["secp"] }
ckb-sdk-types = { path = "../ckb-sdk-types" }
14 changes: 9 additions & 5 deletions devtools/azure/windows-dependencies.yml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
parameters:
rustup_toolchain: ''
steps:
- powershell: Invoke-Expression (New-Object System.Net.WebClient).DownloadString('https://get.scoop.sh')
displayName: Install scoop
- script: |
choco install -y llvm
set "PATH=%PATH%;C:\Program Files\LLVM\bin"
echo "##vso[task.setvariable variable=PATH;]%PATH%;C:\Program Files\LLVM\bin"
set PATH=%PATH%;%USERPROFILE%\scoop\shims
echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\scoop\shims"
scoop help
displayName: Add scoop to path
- script: scoop install llvm
displayName: Install LLVM
- script: choco install -y msys2
- script: scoop install msys2
displayName: Install msys2
- script: choco install --allow-empty-checksums -y yasm
- script: scoop install yasm
displayName: Install yasm
- script: |
curl -sSf -o rustup-init.exe https://win.rustup.rs
Expand Down

0 comments on commit 5a9905d

Please sign in to comment.