Skip to content

Commit

Permalink
Merge pull request #5697 from iron-fish/staging
Browse files Browse the repository at this point in the history
Staging to master v2.10.0
  • Loading branch information
patnir authored Dec 16, 2024
2 parents 6693fe5 + 22ddf34 commit 03b5180
Show file tree
Hide file tree
Showing 130 changed files with 5,545 additions and 1,029 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/build-ironfish-rust-nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: false
matrix:
settings:
- host: ubuntu-latest
- host: ubuntu-22.04
target: x86_64-apple-darwin

- host: windows-latest
Expand All @@ -24,16 +24,16 @@ jobs:
- host: macos-latest
target: x86_64-unknown-linux-gnu

- host: ubuntu-latest
- host: ubuntu-22.04
target: x86_64-unknown-linux-musl

- host: ubuntu-latest
- host: ubuntu-22.04
target: aarch64-apple-darwin

- host: ubuntu-latest
- host: ubuntu-22.04
target: aarch64-unknown-linux-gnu

- host: ubuntu-latest
- host: ubuntu-22.04
target: aarch64-unknown-linux-musl

name: Build ${{ matrix.settings.target }}
Expand Down Expand Up @@ -94,19 +94,19 @@ jobs:
- host: windows-latest
target: x86_64-pc-windows-msvc

- host: ubuntu-latest
- host: ubuntu-22.04
target: x86_64-unknown-linux-gnu
docker: node:18-slim

- host: ubuntu-latest
- host: ubuntu-22.04
target: x86_64-unknown-linux-musl
docker: node:18-alpine

- host: ubuntu-latest
- host: ubuntu-22.04
target: aarch64-unknown-linux-gnu
docker: ghcr.io/napi-rs/napi-rs/nodejs:aarch64-16

- host: ubuntu-latest
- host: ubuntu-22.04
target: aarch64-unknown-linux-musl
docker: arm64v8/node:18-alpine
platform: linux/arm64/v8
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-pr-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
check:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- if: ${{ contains(github.event.pull_request.base.ref, 'master') && !contains(github.event.pull_request.title, 'master') }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-regenerate-fixtures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
test:
name: Test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Check out Git repository
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
lint:
name: Lint

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Check out Git repository
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
test:
name: Test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
shard: [1/3, 2/3, 3/3]
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:

testslow:
name: Slow Tests
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
shard: [1/2, 2/2]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-node-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ permissions:
jobs:
Deploy:
name: Deploy
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Check out Git repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-npm-ironfish-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check out Git repository
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-npm-ironfish-rust-nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

publish:
name: Publish
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs:
- build-and-test
defaults:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-npm-ironfish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check out Git repository
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-version-to-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
jobs:
Push:
name: Push Version to API
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Check out Git repository
Expand Down
49 changes: 40 additions & 9 deletions .github/workflows/rust_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
- "ironfish-phase2/**"
- "ironfish-rust/**"
- "ironfish-rust-nodejs/**"
- "ironfish-rust-wasm/**"
- "ironfish-zkp/**"
- "rust-toolchain"
- ".github/workflows/rust*"
Expand All @@ -20,6 +21,7 @@ on:
- "ironfish-phase2/**"
- "ironfish-rust/**"
- "ironfish-rust-nodejs/**"
- "ironfish-rust-wasm/**"
- "ironfish-zkp/**"
- "rust-toolchain"
- ".github/workflows/rust*"
Expand All @@ -31,7 +33,7 @@ name: Rust CI
jobs:
rust_lint:
name: Lint Rust
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand All @@ -48,17 +50,20 @@ jobs:
- name: Check for license headers for ironfish-rust-nodejs
run: ./ci/lintHeaders.sh ./ironfish-rust-nodejs/src *.rs

- name: "`cargo fmt` check on ironfish-rust"
- name: Check for license headers for ironfish-rust-wasm
run: ./ci/lintHeaders.sh ./ironfish-rust-wasm/src *.rs

- name: cargo fmt
run: |
cargo fmt --all -- --check
- name: "Clippy check on ironfish-rust"
- name: cargo clippy
run: |
cargo clippy --all-targets --all-features -- -D warnings
cargo_check:
name: Check Rust
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand All @@ -78,7 +83,7 @@ jobs:
cargo_vet:
name: Vet Dependencies
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand All @@ -98,7 +103,7 @@ jobs:
ironfish_rust:
name: Test ironfish-rust
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
shard: [1/2, 2/2]
Expand Down Expand Up @@ -137,7 +142,7 @@ jobs:

ironfish_rust_no_default_features:
name: Test ironfish-rust (no default features)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
shard: [1/2, 2/2]
Expand All @@ -163,7 +168,7 @@ jobs:
ironfish_rust_all_features:
name: Test ironfish-rust (all features)
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
shard: [1/2, 2/2]
Expand All @@ -189,7 +194,7 @@ jobs:
ironfish_zkp:
name: Test ironfish-zkp
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -220,3 +225,29 @@ jobs:
with:
token: ${{secrets.CODECOV_TOKEN}}
flags: ironfish-zkp

ironfish_wasm:
name: Test ironfish-rust-wasm
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

- name: Cache Rust
uses: Swatinem/rust-cache@v2
with:
shared-key: wasm

- name: Install wasm-pack
# use the installation method reccommended on
# https://rustwasm.github.io/docs/wasm-bindgen/wasm-bindgen-test/continuous-integration.html#github-actions
run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh

- name: Run tests in Firefox
run: |
cd ironfish-rust-wasm
wasm-pack test --headless --firefox
- name: Run tests in Chrome
run: |
cd ironfish-rust-wasm
wasm-pack test --headless --chrome
2 changes: 1 addition & 1 deletion .github/workflows/rust_ci_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ name: Cache Rust build
jobs:
build-rust-cache:
name: Build and cache rust code
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down
Loading

0 comments on commit 03b5180

Please sign in to comment.