Skip to content

Commit

Permalink
Merge pull request #539 from EspressoSystems/ma/update-hotshot-0.5.38
Browse files Browse the repository at this point in the history
Update hotshot 0.5.37 -> 0.5.39
  • Loading branch information
jbearer authored Apr 19, 2024
2 parents 6a98ba2 + bbc97ba commit 7950ec4
Show file tree
Hide file tree
Showing 4 changed files with 139 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
build:
runs-on: ubuntu-latest
env:
RUSTFLAGS: "--cfg async_executor_impl=\"async-std\" --cfg async_channel_impl=\"async-std\""
RUST_LOG: info
RUSTFLAGS: '--cfg async_executor_impl="async-std" --cfg async_channel_impl="async-std"'
RUST_LOG: info
steps:
- uses: styfle/cancel-workflow-action@0.12.1
name: Cancel Outdated Builds
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/debug_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
build:
runs-on: ubuntu-latest
env:
RUSTFLAGS: "--cfg async_executor_impl=\"async-std\" --cfg async_channel_impl=\"async-std\""
RUST_LOG: info
RUST_MIN_STACK: '3145728'
RUSTFLAGS: '--cfg async_executor_impl="async-std" --cfg async_channel_impl="async-std"'
RUST_LOG: info
RUST_MIN_STACK: "3145728"
steps:
- uses: actions/checkout@v4
name: Checkout Repository
Expand Down
151 changes: 129 additions & 22 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ derivative = "2.2"
derive_more = "0.99"
either = "1.11"
futures = "0.3"
hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.37" }
hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.37" }
hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.37" }
hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.39" }
hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.39" }
hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.39" }
itertools = "0.12.1"
jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.3" }
prometheus = "0.13"
Expand Down Expand Up @@ -112,7 +112,7 @@ tokio-postgres = { version = "0.7", optional = true, default-features = false, f

# Dependencies enabled by feature "testing".
espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0", optional = true }
hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.37", optional = true }
hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.39", optional = true }
portpicker = { version = "0.1", optional = true }
rand = { version = "0.8", optional = true }
spin_sleep = { version = "1.2", optional = true }
Expand All @@ -132,7 +132,7 @@ backtrace-on-stack-overflow = { version = "0.3", optional = true }
[dev-dependencies]
espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0" }
generic-array = "0.14"
hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.37" }
hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.39" }
portpicker = "0.1"
rand = "0.8"
reqwest = "0.12.3"
Expand Down

0 comments on commit 7950ec4

Please sign in to comment.