Skip to content

Commit

Permalink
Merge branch 'narwhal' into noise
Browse files Browse the repository at this point in the history
  • Loading branch information
niklaslong committed Sep 6, 2023
2 parents 76e7d96 + c9031fb commit 86b3c43
Show file tree
Hide file tree
Showing 99 changed files with 2,576 additions and 3,887 deletions.
50 changes: 35 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ commands:
jobs:
integration:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: 2xlarge
steps:
- run_serial_long:
Expand All @@ -165,7 +165,7 @@ jobs:

snarkos:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: 2xlarge
steps:
- run_serial:
Expand All @@ -174,7 +174,7 @@ jobs:

account:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- run_serial:
Expand All @@ -183,7 +183,7 @@ jobs:

cli:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- run_serial:
Expand All @@ -192,7 +192,7 @@ jobs:

display:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- run_serial:
Expand All @@ -201,7 +201,7 @@ jobs:

node:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: 2xlarge
steps:
- run_serial:
Expand All @@ -210,7 +210,7 @@ jobs:

node-cdn:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- run_serial:
Expand All @@ -219,7 +219,7 @@ jobs:

node-consensus:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: 2xlarge
steps:
- run_serial:
Expand All @@ -228,7 +228,7 @@ jobs:

node-messages:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- run_serial:
Expand All @@ -237,16 +237,34 @@ jobs:

node-narwhal:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: 2xlarge
steps:
- run_serial:
workspace_member: node/narwhal
cache_key: snarkos-node-narwhal-cache

node-narwhal-ledger-service:
docker:
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- run_serial:
workspace_member: node/narwhal/ledger-service
cache_key: snarkos-node-narwhal-ledger-service-cache

node-narwhal-locators:
docker:
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- run_serial:
workspace_member: node/narwhal/locators
cache_key: snarkos-node-narwhal-locators-cache

node-rest:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- run_serial:
Expand All @@ -255,7 +273,7 @@ jobs:

node-router:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- run_serial:
Expand All @@ -264,7 +282,7 @@ jobs:

node-tcp:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- run_serial:
Expand All @@ -273,7 +291,7 @@ jobs:

check-fmt:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: xlarge
steps:
- checkout
Expand All @@ -289,7 +307,7 @@ jobs:

check-clippy:
docker:
- image: cimg/rust:1.68
- image: cimg/rust:1.72
resource_class: 2xlarge
steps:
- checkout
Expand Down Expand Up @@ -331,6 +349,8 @@ workflows:
- node-consensus
- node-messages
- node-narwhal
- node-narwhal-ledger-service
- node-narwhal-locators
- node-rest
- node-router
- node-tcp
Expand Down
2 changes: 1 addition & 1 deletion .integration/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "snarkos-integration"
version = "2.1.6"
version = "2.1.7"
authors = [ "The Aleo Team <[email protected]>" ]
description = "A integration testing suite for a decentralized operating system"
homepage = "https://aleo.org"
Expand Down
2 changes: 1 addition & 1 deletion .resources/release-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v2.1.6
v2.1.7
Loading

0 comments on commit 86b3c43

Please sign in to comment.