Skip to content

Commit e2a715c

Browse files
committed
Merge branch 'staging' of https://github.com/AleoHQ/snarkOS
2 parents d0271f3 + 986c9a5 commit e2a715c

File tree

22 files changed

+296
-116
lines changed

22 files changed

+296
-116
lines changed

.circleci/config.yml

Lines changed: 152 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ commands:
4141
- .cache/sccache
4242
- .cargo
4343
jobs:
44-
rust_stable:
44+
rust-stable:
4545
docker:
4646
- image: cimg/rust:1.51.0
4747
resource_class: 2xlarge
@@ -59,6 +59,7 @@ jobs:
5959
paths: project/
6060
- clear_environment:
6161
cache_key: snarkos-stable-cache
62+
6263
codecov:
6364
machine:
6465
image: ubuntu-1604:202004-01
@@ -74,7 +75,8 @@ jobs:
7475
docker run --security-opt seccomp=unconfined -v ~/project/project/:/home/circleci/project/
7576
howardwu/snarkos-codecov:2021-03-25 bash /home/circleci/project/ci/kcov.sh
7677
- run: cd ./project/ && bash <(curl -s https://codecov.io/bash)
77-
rust_nightly:
78+
79+
rust-nightly:
7880
docker:
7981
- image: howardwu/snarkos-ci:2021-03-25
8082
resource_class: 2xlarge
@@ -88,12 +90,157 @@ jobs:
8890
command: RUST_MIN_STACK=8388608 cargo test --all -- --skip test_rpc_create_raw_transaction
8991
- clear_environment:
9092
cache_key: snarkos-nightly-cache
93+
94+
snarkos-consensus:
95+
docker:
96+
- image: cimg/rust:1.51.0
97+
resource_class: xlarge
98+
steps:
99+
- checkout
100+
- setup_environment:
101+
cache_key: snarkos-consensus-cache
102+
- run:
103+
name: Build and run tests
104+
no_output_timeout: 35m
105+
command: cd consensus && RUST_MIN_STACK=8388608 cargo test
106+
- clear_environment:
107+
cache_key: snarkos-consensus-cache
108+
109+
snarkos-metrics:
110+
docker:
111+
- image: cimg/rust:1.51.0
112+
resource_class: xlarge
113+
steps:
114+
- checkout
115+
- setup_environment:
116+
cache_key: snarkos-metrics-cache
117+
- run:
118+
name: Build and run tests
119+
no_output_timeout: 35m
120+
command: cd metrics && RUST_MIN_STACK=8388608 cargo test
121+
- clear_environment:
122+
cache_key: snarkos-metrics-cache
123+
124+
snarkos-network:
125+
docker:
126+
- image: cimg/rust:1.51.0
127+
resource_class: xlarge
128+
steps:
129+
- checkout
130+
- setup_environment:
131+
cache_key: snarkos-network-cache
132+
- run:
133+
name: Build and run tests
134+
no_output_timeout: 35m
135+
command: cd network && RUST_MIN_STACK=8388608 cargo test
136+
- clear_environment:
137+
cache_key: snarkos-network-cache
138+
139+
snarkos-parameters:
140+
docker:
141+
- image: cimg/rust:1.51.0
142+
resource_class: xlarge
143+
steps:
144+
- checkout
145+
- setup_environment:
146+
cache_key: snarkos-parameters-cache
147+
- run:
148+
name: Build and run tests
149+
no_output_timeout: 35m
150+
command: cd parameters && RUST_MIN_STACK=8388608 cargo test
151+
- clear_environment:
152+
cache_key: snarkos-parameters-cache
153+
154+
snarkos-profiler:
155+
docker:
156+
- image: cimg/rust:1.51.0
157+
resource_class: xlarge
158+
steps:
159+
- checkout
160+
- setup_environment:
161+
cache_key: snarkos-profiler-cache
162+
- run:
163+
name: Build and run tests
164+
no_output_timeout: 35m
165+
command: cd profiler && RUST_MIN_STACK=8388608 cargo test
166+
- clear_environment:
167+
cache_key: snarkos-profiler-cache
168+
169+
snarkos-rpc:
170+
docker:
171+
- image: cimg/rust:1.51.0
172+
resource_class: xlarge
173+
steps:
174+
- checkout
175+
- setup_environment:
176+
cache_key: snarkos-rpc-cache
177+
- run:
178+
name: Build and run tests
179+
no_output_timeout: 35m
180+
command: cd rpc && RUST_MIN_STACK=8388608 cargo test
181+
- clear_environment:
182+
cache_key: snarkos-rpc-cache
183+
184+
snarkos-storage:
185+
docker:
186+
- image: cimg/rust:1.51.0
187+
resource_class: xlarge
188+
steps:
189+
- checkout
190+
- setup_environment:
191+
cache_key: snarkos-storage-cache
192+
- run:
193+
name: Build and run tests
194+
no_output_timeout: 35m
195+
command: cd storage && RUST_MIN_STACK=8388608 cargo test
196+
- clear_environment:
197+
cache_key: snarkos-storage-cache
198+
199+
snarkos-testing:
200+
docker:
201+
- image: cimg/rust:1.51.0
202+
resource_class: xlarge
203+
steps:
204+
- checkout
205+
- setup_environment:
206+
cache_key: snarkos-testing-cache
207+
- run:
208+
name: Build and run tests
209+
no_output_timeout: 35m
210+
command: cd testing && RUST_MIN_STACK=8388608 cargo test
211+
- clear_environment:
212+
cache_key: snarkos-testing-cache
213+
214+
snarkos-toolkit:
215+
docker:
216+
- image: cimg/rust:1.51.0
217+
resource_class: xlarge
218+
steps:
219+
- checkout
220+
- setup_environment:
221+
cache_key: snarkos-toolkit-cache
222+
- run:
223+
name: Build and run tests
224+
no_output_timeout: 35m
225+
command: cd toolkit && RUST_MIN_STACK=8388608 cargo test
226+
- clear_environment:
227+
cache_key: snarkos-toolkit-cache
228+
91229
workflows:
92230
version: 2
93231
main-workflow:
94232
jobs:
95-
- rust_stable
96-
- rust_nightly
233+
- rust-stable
234+
- rust-nightly
97235
- codecov:
98236
requires:
99-
- rust_stable
237+
- rust-stable
238+
- snarkos-consensus
239+
- snarkos-metrics
240+
- snarkos-network
241+
- snarkos-parameters
242+
- snarkos-profiler
243+
- snarkos-rpc
244+
- snarkos-storage
245+
- snarkos-testing
246+
- snarkos-toolkit

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
1-
<!--
2-
Thank you for submitting the PR! We appreciate you spending the time to work on these changes.
3-
4-
Help us understand your motivation by explaining why you decided to make this change.
5-
6-
Happy contributing!
7-
-->
1+
<!-- Thank you for filing a PR! Help us understand by explaining your changes. Happy contributing! -->
82

93
## Motivation
104

115
(Write your motivation here)
126

137
## Test Plan
148

15-
<!--
16-
If you changed any code,
17-
please provide us with clear instructions on how you verified your changes work.
18-
Bonus points for screenshots and videos!
19-
-->
9+
<!-- If you changed any code, please provide us with clear instructions on how you verified your changes work. -->
2010

2111
(Write your test plan here)
2212

0 commit comments

Comments
 (0)