build(deps): bump regex from 1.6.0 to 1.7.0 (#5565)

* build(deps): bump regex from 1.6.0 to 1.7.0

Bumps [regex](https://github.com/rust-lang/regex) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/rust-lang/regex/releases)
- [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-lang/regex/compare/1.6.0...1.7.0)

---
updated-dependencies:
- dependency-name: regex
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Add a getblocktemplate-rpcs feature to zebra-chain, and fix missing feature deps

* Run OS tests using release builds

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: teor <teor@riseup.net>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
dependabot[bot] 2022-11-09 07:36:10 +00:00 committed by GitHub
parent c4fad29824
commit 9b533ab059
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 76 additions and 17 deletions

View File

@ -154,7 +154,7 @@ jobs:
- name: Fetch path to Zcash parameters
working-directory: ./zebra-consensus
shell: bash
run: echo "ZCASH_PARAMS=$(cargo run --example get-params-path)" >> $GITHUB_ENV
run: echo "ZCASH_PARAMS=$(cargo run --release --example get-params-path)" >> $GITHUB_ENV
- name: Cache Zcash parameters
id: cache-params
uses: actions/cache@v3
@ -164,7 +164,7 @@ jobs:
- name: Fetch Zcash parameters
if: steps.cache-params.outputs.cache-hit != 'true'
working-directory: ./zebra-consensus
run: cargo run --example download-params
run: cargo run --release --example download-params
# Run unit and basic acceptance tests, only showing command output if the test fails.
#
@ -173,7 +173,7 @@ jobs:
uses: actions-rs/cargo@v1.0.3
with:
command: test
args: ${{ matrix.features }} --verbose --workspace
args: ${{ matrix.features }} --release --verbose --workspace
# Explicitly run any tests that are usually #[ignored]
@ -186,7 +186,7 @@ jobs:
with:
command: test
# Note: this only runs the zebrad acceptance tests, because re-running all the test binaries is slow on Windows
args: ${{ matrix.features }} --verbose --package zebrad --test acceptance -- --nocapture --include-ignored sync_large_checkpoints_
args: ${{ matrix.features }} --release --verbose --package zebrad --test acceptance -- --nocapture --include-ignored sync_large_checkpoints_
# Install Zebra with lockfile dependencies, with no caching and default features
install-from-lockfile-no-cache:

4
Cargo.lock generated
View File

@ -3378,9 +3378,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.6.0"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
dependencies = [
"aho-corasick",
"memchr",

View File

@ -9,7 +9,23 @@ edition = "2021"
[features]
default = []
proptest-impl = ["proptest", "proptest-derive", "zebra-test", "rand", "rand_chacha", "tokio"]
# Production features that activate extra functionality
# Experimental mining RPC support
getblocktemplate-rpcs = []
# Test-only features
proptest-impl = [
"proptest",
"proptest-derive",
"rand",
"rand_chacha",
"tokio",
"zebra-test",
]
bench = ["zebra-test"]
[dependencies]

View File

@ -26,7 +26,7 @@ ordered-map = "0.4.2"
pin-project = "1.0.12"
rand = { version = "0.8.5", package = "rand" }
rayon = "1.5.3"
regex = "1.6.0"
regex = "1.7.0"
serde = { version = "1.0.147", features = ["serde_derive"] }
thiserror = "1.0.37"

View File

@ -8,7 +8,13 @@ repository = "https://github.com/ZcashFoundation/zebra"
[features]
default = []
getblocktemplate-rpcs = []
# Production features that activate extra dependencies, or extra features in dependencies
# Experimental mining RPC support
getblocktemplate-rpcs = [
"zebra-chain/getblocktemplate-rpcs",
]
[dependencies]
zebra-chain = { path = "../zebra-chain" }

View File

@ -9,10 +9,25 @@ edition = "2021"
[features]
default = []
getblocktemplate-rpcs = ["zebra-state/getblocktemplate-rpcs", "zebra-node-services/getblocktemplate-rpcs", "zebra-consensus/getblocktemplate-rpcs"]
# Production features that activate extra dependencies, or extra features in dependencies
# Experimental mining RPC support
getblocktemplate-rpcs = [
"zebra-consensus/getblocktemplate-rpcs",
"zebra-state/getblocktemplate-rpcs",
"zebra-node-services/getblocktemplate-rpcs",
"zebra-chain/getblocktemplate-rpcs",
]
# Test-only features
proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl", "zebra-state/proptest-impl"]
proptest-impl = [
"proptest",
"proptest-derive",
"zebra-consensus/proptest-impl",
"zebra-state/proptest-impl",
"zebra-chain/proptest-impl",
]
[dependencies]
chrono = { version = "0.4.22", default-features = false, features = ["clock", "std"] }

View File

@ -6,8 +6,21 @@ license = "MIT OR Apache-2.0"
edition = "2021"
[features]
proptest-impl = ["proptest", "proptest-derive", "zebra-test", "zebra-chain/proptest-impl"]
getblocktemplate-rpcs = []
# Production features that activate extra dependencies, or extra features in dependencies
# Experimental mining RPC support
getblocktemplate-rpcs = [
"zebra-chain/getblocktemplate-rpcs",
]
# Test-only features
proptest-impl = [
"proptest",
"proptest-derive",
"zebra-test",
"zebra-chain/proptest-impl"
]
[dependencies]
bincode = "1.3.3"
@ -21,7 +34,7 @@ itertools = "0.10.5"
lazy_static = "1.4.0"
metrics = "0.20.1"
mset = "0.1.0"
regex = "1.6.0"
regex = "1.7.0"
rlimit = "0.8.3"
rocksdb = { version = "0.19.0", default_features = false, features = ["lz4"] }
serde = { version = "1.0.147", features = ["serde_derive"] }

View File

@ -15,7 +15,7 @@ insta = "1.21.0"
proptest = "0.10.1"
once_cell = "1.16.0"
rand = { version = "0.8.5", package = "rand" }
regex = "1.6.0"
regex = "1.7.0"
tokio = { version = "1.21.2", features = ["full", "tracing", "test-util"] }
tower = { version = "0.4.13", features = ["util"] }

View File

@ -21,8 +21,10 @@ default = ["release_max_level_info"]
# Experimental mining RPC support
getblocktemplate-rpcs = [
"zebra-rpc/getblocktemplate-rpcs",
"zebra-consensus/getblocktemplate-rpcs",
"zebra-state/getblocktemplate-rpcs",
"zebra-node-services/getblocktemplate-rpcs",
"zebra-chain/getblocktemplate-rpcs",
]
sentry = ["dep:sentry", "sentry-tracing"]
@ -50,7 +52,14 @@ max_level_info = ["tracing/max_level_info", "log/max_level_info"]
max_level_debug = ["tracing/max_level_debug", "log/max_level_debug"]
# Testing features that activate extra dependencies
proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl", "zebra-state/proptest-impl", "zebra-consensus/proptest-impl", "zebra-network/proptest-impl"]
proptest-impl = [
"proptest",
"proptest-derive",
"zebra-consensus/proptest-impl",
"zebra-state/proptest-impl",
"zebra-network/proptest-impl",
"zebra-chain/proptest-impl",
]
# The gRPC tests also need an installed lightwalletd binary
lightwalletd-grpc-tests = ["tonic-build"]
@ -159,7 +168,7 @@ tonic-build = { version = "0.8.0", optional = true }
abscissa_core = { version = "0.5", features = ["testing"] }
hex = "0.4.3"
once_cell = "1.16.0"
regex = "1.6.0"
regex = "1.7.0"
semver = "1.0.14"
# zebra-rpc needs the preserve_order feature, it also makes test results more stable