Skip to content

Commit e84a844

Browse files
committed
Merge branch 'staging' into perf/cache_block_tree
2 parents 89a002e + 227cd09 commit e84a844

File tree

98 files changed

+1461
-363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1461
-363
lines changed

.cargo/release-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v4.3.0
1+
v4.4.0

.circleci/config.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -684,21 +684,21 @@ jobs:
684684

685685
ledger-with-rocksdb-partition1:
686686
executor: rust-docker
687-
resource_class: << pipeline.parameters.large >>
687+
resource_class: << pipeline.parameters.xlarge >>
688688
steps:
689689
- run_test:
690690
workspace_member: snarkvm-ledger
691-
flags: --release --features=rocks --partition count:1/2 -- --test-threads=8
691+
flags: --release --features=rocks --partition count:1/2 -- --test-threads=10
692692
no_output_timeout: 20m
693693
timeout: 30m
694694

695695
ledger-with-rocksdb-partition2:
696696
executor: rust-docker
697-
resource_class: << pipeline.parameters.large >>
697+
resource_class: << pipeline.parameters.xlarge >>
698698
steps:
699699
- run_test:
700700
workspace_member: snarkvm-ledger
701-
flags: --release --features=rocks --partition count:2/2 -- --test-threads=8
701+
flags: --release --features=rocks --partition count:2/2 -- --test-threads=10
702702
no_output_timeout: 20m
703703
timeout: 30m
704704

@@ -1063,7 +1063,10 @@ jobs:
10631063
name: Check for unused dependencies
10641064
no_output_timeout: 10m
10651065
command: |
1066-
cargo install [email protected]
1066+
set -euo pipefail
1067+
if ! command -v cargo-machete >/dev/null 2>&1; then
1068+
cargo install [email protected] --locked
1069+
fi
10671070
cargo machete
10681071
- clear_environment:
10691072
cache_key: v4.2.0-rust-1.88.0-machete-cache
@@ -1088,7 +1091,8 @@ jobs:
10881091
executor: rust-docker
10891092
resource_class: << pipeline.parameters.twoxlarge >>
10901093
steps:
1091-
- checkout
1094+
- checkout:
1095+
method: full
10921096
- setup_environment:
10931097
cache_key: v4.2.0-rust-1.88.0-cargo-semver-checks-cache
10941098
- run:

.circleci/semver-checks.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#! /bin/bash
22

3+
set -x
4+
5+
BASELINE_REV=acd55ad100550 # UPDATE ME ON NECESSARY BREAKING CHANGES
6+
37
# Ensure that the command is installed.
48
cargo install [email protected] --locked
59

6-
BASELINE_REV=dec54170ce # UPDATE ME ON NECESSARY BREAKING CHANGES
10+
# Ensure we can find the baseline revision
11+
git fetch --unshallow || true
712

8-
# Exclude CLI as it has been removed
9-
cargo semver-checks --workspace --default-features \
10-
--exclude=snarkvm-cli --baseline-rev $BASELINE_REV
13+
cargo semver-checks --workspace --default-features --baseline-rev $BASELINE_REV

0 commit comments

Comments
 (0)