Skip to content

Commit

Permalink
Merge branch 'main' into state-download
Browse files Browse the repository at this point in the history
  • Loading branch information
tomaka committed Oct 20, 2022
2 parents 1adf582 + 8ac5d37 commit 2baf614
Show file tree
Hide file tree
Showing 42 changed files with 2,286 additions and 953 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
test-64bits:
runs-on: ubuntu-latest
container:
image: rust:1.61
image: rust:1.64
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v1
Expand All @@ -36,7 +36,7 @@ jobs:
test-32bits:
runs-on: ubuntu-latest
container:
image: rust:1.61
image: rust:1.64
steps:
- run: apt-get update && apt install -y libc6-dev-i386
- uses: actions/checkout@v3
Expand All @@ -47,12 +47,12 @@ jobs:
wasm-node-check:
runs-on: ubuntu-latest
container:
image: rust:1.61
image: rust:1.64
steps:
- run: apt-get update && apt install -y binaryen # For `wasm-opt`
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v1
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
node-version: '12' # An old version is used to ensure compatibility
- uses: denoland/setup-deno@v1
Expand All @@ -63,14 +63,14 @@ jobs:
wasm-node-size-diff:
runs-on: ubuntu-latest
container:
image: rust:1.61
image: rust:1.64
steps:
- run: apt-get update && apt install -y cmake # TODO: remove; temporarily needed to build the `prost-build` library in the "before" comparison
- run: apt-get update && apt install -y binaryen # For `wasm-opt`
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Necessary to fetch pull request base below
- uses: Swatinem/rust-cache@v1
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
node-version: '14' # Because this step doesn't actually check anything, we use a more liberal version
- uses: baptiste0928/cargo-install@v1 # This action ensures that the twiggy compilation is cached.
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
check-features:
runs-on: ubuntu-latest
container:
image: rust:1.61
image: rust:1.64
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v1
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
# Since build artifacts are specific to a nightly version, we pin the specific nightly
# version to use in order to not invalidate the build cache every day. The exact version
# is completely arbitrary.
toolchain: nightly-2022-06-05
toolchain: nightly-2022-10-16
override: true
- uses: baptiste0928/cargo-install@v1 # This action ensures that the compilation is cached.
with:
Expand All @@ -141,7 +141,7 @@ jobs:
check-rustdoc-links:
runs-on: ubuntu-latest
container:
image: rust:1.61
image: rust:1.64
steps:
- uses: actions/checkout@v3
- uses: Swatinem/rust-cache@v1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- uses: actions/checkout@v3
with:
path: repo
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
node-version: current
- run: npm install
Expand Down Expand Up @@ -87,10 +87,10 @@ jobs:
npm-publish:
runs-on: ubuntu-latest
container:
image: rust:1.61
image: rust:1.64
steps:
- uses: actions/checkout@v3
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
node-version: 12 # An old version is intentionally used in order to check compatibility
- run: apt-get update && apt install -y binaryen # For `wasm-opt`
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0 # Necessary below for checking if the tag exists.
- uses: actions/[email protected].0
- uses: actions/[email protected].1
with:
node-version: 12
- uses: denoland/setup-deno@v1
Expand Down
59 changes: 51 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ wasmtime = { version = "1.0.1", default-features = false, features = ["async", "
[dev-dependencies]
async-std = "1.12.0"
criterion = "0.4.0"
tempfile = "3.3.0"

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
Expand Down
2 changes: 1 addition & 1 deletion bin/full-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ path = "src/main.rs"
async-std = "1.12.0"
atty = "0.2.14"
blake2-rfc = { version = "0.2.18", default-features = false }
clap = { version = "3.2.22", default-features = false, features = ["color", "derive", "std", "suggestions"] }
clap = { version = "4.0.17", default-features = false, features = ["color", "derive", "help", "std", "suggestions", "usage"] } # Note: enabling/disabling some features modifies the internal behavior of clap, be careful
ctrlc = "3.2.2"
derive_more = "0.99.17"
directories = "4.0.1"
Expand Down
Loading

0 comments on commit 2baf614

Please sign in to comment.