Skip to content

Commit 21f3a88

Browse files
committed
Merge remote-tracking branch 'origin/staging' into postrelease-merge
2 parents 2a5e6e2 + f7abfce commit 21f3a88

File tree

189 files changed

+5243
-1683
lines changed

Some content is hidden

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

189 files changed

+5243
-1683
lines changed

.circleci/config.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ commands:
9090
parameters:
9191
cache_key:
9292
type: string
93-
default: v4.5.1-rust-1.88.0-snarkvm-cache
93+
default: v4.6.0-rust-1.88.0-snarkvm-cache
9494
steps:
9595
- run:
9696
name: Prepare environment variables and install dependencies
@@ -134,8 +134,8 @@ commands:
134134
clang llvm-dev llvm lld pkg-config xz-utils make libssl-dev libssl-dev
135135
- restore_cache:
136136
keys:
137-
- v4.5.1-rust-1.88.0-deps-{{ checksum "Cargo.lock" }}-
138-
- v4.5.1-rust-1.88.0-deps-
137+
- v4.6.0-rust-1.88.0-deps-{{ checksum "Cargo.lock" }}-
138+
- v4.6.0-rust-1.88.0-deps-
139139
- restore_cache:
140140
keys:
141141
- << parameters.cache_key >>
@@ -145,11 +145,11 @@ commands:
145145
parameters:
146146
cache_key:
147147
type: string
148-
default: v4.5.1-rust-1.88.0-snarkvm-cache
148+
default: v4.6.0-rust-1.88.0-snarkvm-cache
149149
steps:
150150
- run: set +e
151151
- save_cache:
152-
key: v4.5.1-rust-1.88.0-deps-{{ checksum "Cargo.lock" }}
152+
key: v4.6.0-rust-1.88.0-deps-{{ checksum "Cargo.lock" }}
153153
paths:
154154
- /home/circleci/.cache/sccache
155155
- /home/circleci/.cargo/registry
@@ -188,7 +188,7 @@ commands:
188188
condition: << parameters.use_cache >>
189189
steps:
190190
- setup_environment:
191-
cache_key: v4.5.1-rust-1.88.0-<< parameters.workspace_member >><< parameters.cache_key_suffix >>-cache
191+
cache_key: v4.6.0-rust-1.88.0-<< parameters.workspace_member >><< parameters.cache_key_suffix >>-cache
192192

193193
- run:
194194
name: Install debian packages (always)
@@ -436,7 +436,7 @@ commands:
436436
condition: << parameters.use_cache >>
437437
steps:
438438
- clear_environment:
439-
cache_key: v4.5.1-rust-1.88.0-<< parameters.workspace_member >><< parameters.cache_key_suffix >>-cache
439+
cache_key: v4.6.0-rust-1.88.0-<< parameters.workspace_member >><< parameters.cache_key_suffix >>-cache
440440

441441
install_rust_nightly:
442442
description: "Install Rust nightly toolchain"
@@ -1054,7 +1054,7 @@ jobs:
10541054
steps:
10551055
- checkout
10561056
- setup_environment:
1057-
cache_key: v4.5.1-rust-1.88.0-snarkvm-wasm-cache
1057+
cache_key: v4.6.0-rust-1.88.0-snarkvm-wasm-cache
10581058
- run:
10591059
no_output_timeout: 30m
10601060
command: |
@@ -1075,7 +1075,7 @@ jobs:
10751075
# Run the tests
10761076
cd wasm && wasm-pack test --node
10771077
- clear_environment:
1078-
cache_key: v4.5.1-rust-1.88.0-snarkvm-wasm-cache
1078+
cache_key: v4.6.0-rust-1.88.0-snarkvm-wasm-cache
10791079

10801080
check-fmt:
10811081
executor: rust-docker
@@ -1084,21 +1084,21 @@ jobs:
10841084
- checkout
10851085
- install_rust_nightly
10861086
- setup_environment:
1087-
cache_key: v4.5.1-rust-1.88.0-snarkvm-fmt-cache
1087+
cache_key: v4.6.0-rust-1.88.0-snarkvm-fmt-cache
10881088
- run:
10891089
name: Check style
10901090
no_output_timeout: 35m
10911091
command: cargo +nightly fmt --all -- --check
10921092
- clear_environment:
1093-
cache_key: v4.5.1-rust-1.88.0-snarkvm-fmt-cache
1093+
cache_key: v4.6.0-rust-1.88.0-snarkvm-fmt-cache
10941094

10951095
check-unused-dependencies:
10961096
executor: rust-docker
10971097
resource_class: << pipeline.parameters.medium >>
10981098
steps:
10991099
- checkout
11001100
- setup_environment:
1101-
cache_key: v4.5.1-rust-1.88.0-machete-cache
1101+
cache_key: v4.6.0-rust-1.88.0-machete-cache
11021102
- run:
11031103
name: Check for unused dependencies
11041104
no_output_timeout: 10m
@@ -1109,23 +1109,23 @@ jobs:
11091109
fi
11101110
cargo machete
11111111
- clear_environment:
1112-
cache_key: v4.5.1-rust-1.88.0-machete-cache
1112+
cache_key: v4.6.0-rust-1.88.0-machete-cache
11131113

11141114
check-cargo-audit:
11151115
executor: rust-docker
11161116
resource_class: << pipeline.parameters.medium >>
11171117
steps:
11181118
- checkout
11191119
- setup_environment:
1120-
cache_key: v4.5.1-rust-1.88.0-cargo-audit-cache
1120+
cache_key: v4.6.0-rust-1.88.0-cargo-audit-cache
11211121
- run:
11221122
name: Check for security vulnerabilities
11231123
no_output_timeout: 10m
11241124
command: |
11251125
cargo install cargo-audit@0.22.0 --locked --force
11261126
cargo audit -D warnings
11271127
- clear_environment:
1128-
cache_key: v4.5.1-rust-1.88.0-cargo-audit-cache
1128+
cache_key: v4.6.0-rust-1.88.0-cargo-audit-cache
11291129

11301130
check-cargo-semver-checks:
11311131
executor: rust-docker
@@ -1134,22 +1134,22 @@ jobs:
11341134
- checkout:
11351135
method: full
11361136
- setup_environment:
1137-
cache_key: v4.5.1-rust-1.88.0-cargo-semver-checks-cache
1137+
cache_key: v4.6.0-rust-1.88.0-cargo-semver-checks-cache
11381138
- run:
11391139
name: Check for semver violations
11401140
no_output_timeout: 15m
11411141
command: |
11421142
bash ./.circleci/semver-checks.sh
11431143
- clear_environment:
1144-
cache_key: v4.5.1-rust-1.88.0-cargo-semver-checks-cache
1144+
cache_key: v4.6.0-rust-1.88.0-cargo-semver-checks-cache
11451145

11461146
check-clippy:
11471147
executor: rust-docker
11481148
resource_class: << pipeline.parameters.xlarge >>
11491149
steps:
11501150
- checkout
11511151
- setup_environment:
1152-
cache_key: v4.5.1-rust-1.88.0-snarkvm-clippy-cache
1152+
cache_key: v4.6.0-rust-1.88.0-snarkvm-clippy-cache
11531153
- run:
11541154
name: Check Clippy (default features)
11551155
timeout: 20m
@@ -1161,21 +1161,21 @@ jobs:
11611161
command: |
11621162
cargo clippy --workspace --all-targets --all-features -- -D warnings
11631163
- clear_environment:
1164-
cache_key: v4.5.1-rust-1.88.0-snarkvm-clippy-cache
1164+
cache_key: v4.6.0-rust-1.88.0-snarkvm-clippy-cache
11651165

11661166
check-all-targets:
11671167
executor: rust-docker
11681168
resource_class: << pipeline.parameters.small >>
11691169
steps:
11701170
- checkout
11711171
- setup_environment:
1172-
cache_key: v4.5.1-rust-1.88.0-snarkvm-all-targets-cache
1172+
cache_key: v4.6.0-rust-1.88.0-snarkvm-all-targets-cache
11731173
- run:
11741174
name: Check all targets
11751175
no_output_timeout: 35m
11761176
command: cargo check --release --workspace --all-targets
11771177
- clear_environment:
1178-
cache_key: v4.5.1-rust-1.88.0-snarkvm-all-targets-cache
1178+
cache_key: v4.6.0-rust-1.88.0-snarkvm-all-targets-cache
11791179

11801180
verify-windows:
11811181
executor:

0 commit comments

Comments
 (0)