Skip to content

Commit

Permalink
Merge branch 'staging' of https://github.com/AleoHQ/snarkOS
Browse files Browse the repository at this point in the history
  • Loading branch information
howardwu committed May 26, 2021
2 parents d0271f3 + 986c9a5 commit e2a715c
Show file tree
Hide file tree
Showing 22 changed files with 296 additions and 116 deletions.
157 changes: 152 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ commands:
- .cache/sccache
- .cargo
jobs:
rust_stable:
rust-stable:
docker:
- image: cimg/rust:1.51.0
resource_class: 2xlarge
Expand All @@ -59,6 +59,7 @@ jobs:
paths: project/
- clear_environment:
cache_key: snarkos-stable-cache

codecov:
machine:
image: ubuntu-1604:202004-01
Expand All @@ -74,7 +75,8 @@ jobs:
docker run --security-opt seccomp=unconfined -v ~/project/project/:/home/circleci/project/
howardwu/snarkos-codecov:2021-03-25 bash /home/circleci/project/ci/kcov.sh
- run: cd ./project/ && bash <(curl -s https://codecov.io/bash)
rust_nightly:

rust-nightly:
docker:
- image: howardwu/snarkos-ci:2021-03-25
resource_class: 2xlarge
Expand All @@ -88,12 +90,157 @@ jobs:
command: RUST_MIN_STACK=8388608 cargo test --all -- --skip test_rpc_create_raw_transaction
- clear_environment:
cache_key: snarkos-nightly-cache

snarkos-consensus:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkos-consensus-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd consensus && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkos-consensus-cache

snarkos-metrics:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkos-metrics-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd metrics && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkos-metrics-cache

snarkos-network:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkos-network-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd network && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkos-network-cache

snarkos-parameters:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkos-parameters-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd parameters && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkos-parameters-cache

snarkos-profiler:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkos-profiler-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd profiler && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkos-profiler-cache

snarkos-rpc:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkos-rpc-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd rpc && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkos-rpc-cache

snarkos-storage:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkos-storage-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd storage && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkos-storage-cache

snarkos-testing:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkos-testing-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd testing && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkos-testing-cache

snarkos-toolkit:
docker:
- image: cimg/rust:1.51.0
resource_class: xlarge
steps:
- checkout
- setup_environment:
cache_key: snarkos-toolkit-cache
- run:
name: Build and run tests
no_output_timeout: 35m
command: cd toolkit && RUST_MIN_STACK=8388608 cargo test
- clear_environment:
cache_key: snarkos-toolkit-cache

workflows:
version: 2
main-workflow:
jobs:
- rust_stable
- rust_nightly
- rust-stable
- rust-nightly
- codecov:
requires:
- rust_stable
- rust-stable
- snarkos-consensus
- snarkos-metrics
- snarkos-network
- snarkos-parameters
- snarkos-profiler
- snarkos-rpc
- snarkos-storage
- snarkos-testing
- snarkos-toolkit
14 changes: 2 additions & 12 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
<!--
Thank you for submitting the PR! We appreciate you spending the time to work on these changes.
Help us understand your motivation by explaining why you decided to make this change.
Happy contributing!
-->
<!-- Thank you for filing a PR! Help us understand by explaining your changes. Happy contributing! -->

## Motivation

(Write your motivation here)

## Test Plan

<!--
If you changed any code,
please provide us with clear instructions on how you verified your changes work.
Bonus points for screenshots and videos!
-->
<!-- If you changed any code, please provide us with clear instructions on how you verified your changes work. -->

(Write your test plan here)

Expand Down
Loading

0 comments on commit e2a715c

Please sign in to comment.