Skip to content

Commit

Permalink
Merge branch 'staging' into perf/lock_tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
raychu86 authored Jan 23, 2025
2 parents 9bbba95 + 7c4a910 commit 78229cd
Show file tree
Hide file tree
Showing 95 changed files with 1,293 additions and 569 deletions.
2 changes: 1 addition & 1 deletion .cargo/release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.1.0
v1.2.1
17 changes: 14 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ parameters:
default: xlarge
twoxlarge:
type: string
default: aleonet/2xlarge
default: 2xlarge

orbs:
windows: circleci/[email protected]
Expand Down Expand Up @@ -682,17 +682,27 @@ jobs:
resource_class: << pipeline.parameters.twoxlarge >>
steps:
- run_serial:
flags: --lib --bins -- --test-threads=2
flags: --lib --bins
workspace_member: synthesizer
cache_key: v1.0.0-rust-1.81.0-snarkvm-synthesizer-cache

synthesizer-mem-heavy:
docker:
- image: cimg/rust:1.81.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
resource_class: << pipeline.parameters.twoxlarge >>
steps:
- run_serial:
flags: -- --ignored test_deployment_synthesis_overload test_deep_nested_execution_cost
workspace_member: synthesizer
cache_key: v1.0.0-rust-1.81.0-snarkvm-synthesizer-mem-heavy-cache

synthesizer-integration:
docker:
- image: cimg/rust:1.81.0 # Attention - Change the MSRV in Cargo.toml and rust-toolchain as well
resource_class: << pipeline.parameters.twoxlarge >>
steps:
- run_serial:
flags: --test '*' -- --test-threads=8
flags: --test '*' --features test -- --test-threads=8
workspace_member: synthesizer
cache_key: v1.0.0-rust-1.81.0-snarkvm-synthesizer-integration-cache

Expand Down Expand Up @@ -966,6 +976,7 @@ workflows:
- parameters
- parameters-uncached
- synthesizer
- synthesizer-mem-heavy
- synthesizer-integration
- synthesizer-process
- synthesizer-process-with-rocksdb
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## 👉 [Please follow one of these issue templates](https://github.com/AleoNet/snarkVM/issues/new/choose) 👈
## 👉 [Please follow one of these issue templates](https://github.com/ProvableHQ/snarkVM/issues/new/choose) 👈

Note: to keep the backlog clean and actionable, issues may be immediately closed if they do not follow one of the above issue templates.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<!--
If this PR adds or changes functionality, please take some time to
update the docs at https://github.com/AleoNet/snarkVM and https://github.com/AleoHQ/protocol-docs,
update the docs at https://github.com/ProvableHQ/snarkVM and https://github.com/AleoHQ/protocol-docs,
and link to your PR here.
-->

Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ Thank you for your interest in contributing to snarkVM! Below you can find some

Please follow the instructions below when filing a pull request:

- ensure that your branch is forked from the current [master](https://github.com/AleoNet/snarkVM/tree/master) branch
- run `cargo fmt` before you commit; we use the `nightly` version of `rustfmt` to format the code, so you'll need to have the `nightly` toolchain installed on your machine; there's a [git hook](https://git-scm.com/docs/githooks) that ensures proper formatting before any commits can be made, and [`.rustfmt.toml`](https://github.com/AleoNet/snarkVM/blob/master/.rustfmt.toml) specifies some of the formatting conventions
- ensure that your branch is forked from the current [master](https://github.com/ProvableHQ/snarkVM/tree/master) branch
- run `cargo fmt` before you commit; we use the `nightly` version of `rustfmt` to format the code, so you'll need to have the `nightly` toolchain installed on your machine; there's a [git hook](https://git-scm.com/docs/githooks) that ensures proper formatting before any commits can be made, and [`.rustfmt.toml`](https://github.com/ProvableHQ/snarkVM/blob/master/.rustfmt.toml) specifies some of the formatting conventions
- run `cargo clippy --all-targets --all-features` to ensure that popular correctness and performance pitfalls are avoided

## Coding conventions
Expand Down
Loading

0 comments on commit 78229cd

Please sign in to comment.