-
Notifications
You must be signed in to change notification settings - Fork 573
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2772 from iron-fish/staging
STAGING -> MASTER
- Loading branch information
Showing
373 changed files
with
21,774 additions
and
22,616 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ on: | |
| - "ironfish-rust-nodejs/**" | ||
| - "ironfish-zkp/**" | ||
| - "rust-toolchain" | ||
| - ".github/workflows/rust_ci.yml" | ||
| - ".github/workflows/rust*" | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
@@ -14,13 +14,13 @@ on: | |
| - "ironfish-rust-nodejs/**" | ||
| - "ironfish-zkp/**" | ||
| - "rust-toolchain" | ||
| - ".github/workflows/rust_ci.yml" | ||
| - ".github/workflows/rust*" | ||
|
|
||
| name: Rust CI | ||
|
|
||
| jobs: | ||
| ironfish_rust: | ||
| name: ironfish-rust | ||
| rust_lint: | ||
| name: Lint Rust | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
@@ -39,39 +39,29 @@ jobs: | |
| command: check | ||
| args: --locked | ||
|
|
||
| # Build & Run test & Collect Code coverage | ||
| - name: Run cargo-tarpaulin on ironfish-rust | ||
| uses: actions-rs/[email protected] | ||
| with: | ||
| version: "0.22.0" | ||
| args: --avoid-cfg-tarpaulin --manifest-path ironfish-rust/Cargo.toml --release -- --test-threads 1 | ||
|
|
||
| # Upload code coverage to Codecov | ||
| - name: Upload to codecov.io | ||
| uses: codecov/[email protected] | ||
| with: | ||
| token: ${{secrets.CODECOV_TOKEN}} | ||
| flags: ironfish-rust | ||
|
|
||
| - name: Check for license headers | ||
| # Note: ironfish-zkp is does not need this due to different licensing | ||
| - name: Check for license headers for ironfish-rust | ||
| run: ./ci/lintHeaders.sh ./ironfish-rust/src *.rs | ||
|
|
||
| - name: Check for license headers for ironfish-rust-nodejs | ||
| run: ./ci/lintHeaders.sh ./ironfish-rust-nodejs/src *.rs | ||
|
|
||
| # fmt | ||
| - uses: actions-rs/cargo@v1 | ||
| name: "`cargo fmt` check on ironfish-rust" | ||
| with: | ||
| command: fmt | ||
| args: --manifest-path ironfish-rust/Cargo.toml --all -- --check | ||
| args: --all -- --check | ||
|
|
||
| # clippy | ||
| - uses: actions-rs/cargo@v1 | ||
| name: "Clippy check on ironfish-rust" | ||
| with: | ||
| command: clippy | ||
| args: --manifest-path ironfish-rust/Cargo.toml -- -D warnings | ||
| args: --all-targets -- -D warnings | ||
|
|
||
| ironfish_rust_nodejs: | ||
| name: ironfish-rust-nodejs | ||
| ironfish_rust: | ||
| name: Test ironfish-rust | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
@@ -82,34 +72,24 @@ jobs: | |
| - name: Cache Rust | ||
| uses: Swatinem/rust-cache@v2 | ||
| with: | ||
| shared-key: nodejs | ||
|
|
||
| # Check | ||
| - name: Run cargo check on ironfish-rust-nodejs | ||
| uses: actions-rs/cargo@v1 | ||
| with: | ||
| command: "check" | ||
| args: --manifest-path ironfish-rust-nodejs/Cargo.toml | ||
|
|
||
| - name: Check for license headers | ||
| run: ./ci/lintHeaders.sh ./ironfish-rust-nodejs/src *.rs | ||
| shared-key: base | ||
|
|
||
| # fmt | ||
| - uses: actions-rs/cargo@v1 | ||
| name: "`cargo fmt` check on ironfish-rust-nodejs" | ||
| # Build & Run test & Collect Code coverage | ||
| - name: Run cargo-tarpaulin on ironfish-rust | ||
| uses: actions-rs/[email protected] | ||
| with: | ||
| command: fmt | ||
| args: --manifest-path ironfish-rust-nodejs/Cargo.toml --all -- --check | ||
| version: "0.22.0" | ||
| args: --avoid-cfg-tarpaulin --manifest-path ironfish-rust/Cargo.toml --release -- --test-threads 1 | ||
|
|
||
| # clippy | ||
| - uses: actions-rs/cargo@v1 | ||
| name: "Clippy check on ironfish-rust-nodejs" | ||
| # Upload code coverage to Codecov | ||
| - name: Upload to codecov.io | ||
| uses: codecov/[email protected] | ||
| with: | ||
| command: clippy | ||
| args: --manifest-path ironfish-rust-nodejs/Cargo.toml -- -D warnings | ||
| token: ${{secrets.CODECOV_TOKEN}} | ||
| flags: ironfish-rust | ||
|
|
||
| ironfish_zkp: | ||
| name: ironfish-zkp | ||
| name: Test ironfish-zkp | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
@@ -135,17 +115,3 @@ jobs: | |
| with: | ||
| token: ${{secrets.CODECOV_TOKEN}} | ||
| flags: ironfish-zkp | ||
|
|
||
| # fmt | ||
| - uses: actions-rs/cargo@v1 | ||
| name: "`cargo fmt` check on ironfish-zkp" | ||
| with: | ||
| command: fmt | ||
| args: --manifest-path ironfish-zkp/Cargo.toml --all -- --check | ||
|
|
||
| # clippy | ||
| - uses: actions-rs/cargo@v1 | ||
| name: "Clippy check on ironfish-zkp" | ||
| with: | ||
| command: clippy | ||
| args: --manifest-path ironfish-zkp/Cargo.toml -- -D warnings | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
| - staging | ||
| paths: | ||
| - "ironfish-rust/**" | ||
| - "ironfish-rust-nodejs/**" | ||
| - "ironfish-zkp/**" | ||
| - "rust-toolchain" | ||
| - ".github/workflows/rust*" | ||
|
|
||
| name: Cache Rust build | ||
|
|
||
| jobs: | ||
| build-rust-cache: | ||
| name: Build and cache rust code | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions-rs/toolchain@v1 | ||
|
|
||
| - name: Cache Rust | ||
| uses: Swatinem/rust-cache@v2 | ||
| with: | ||
| shared-key: nodejs | ||
|
|
||
| - name: Build NAPI bindings for the cache | ||
| uses: actions-rs/cargo@v1 | ||
| with: | ||
| command: build | ||
| args: --release |
Oops, something went wrong.