Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop in 1.1 #1182

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ ci-check-nostd = "check --no-default-features -F serde -p iota-sdk --target risc
ci-check-types = "check --no-default-features -p iota-sdk"

ci-test = "nextest run --all-features --profile ci --cargo-profile ci -p iota-sdk -p iota-sdk-bindings-core"
ci-tangle-test = "nextest run --tests --all-features --run-ignored ignored-only --profile ci --cargo-profile ci -p iota-sdk -p iota-sdk-bindings-core"
ci-coverage = "llvm-cov nextest --lcov --output-path lcov.info --tests -p iota-sdk --all-features --run-ignored all --profile ci"

ci-clippy = "clippy --all-targets --all-features -- -D warnings"

Expand All @@ -21,6 +23,4 @@ ci-license = "license-template --template .license_template"
#
# - RUSTSEC-2021-0065: https://rustsec.org/advisories/RUSTSEC-2021-0065
# - anymap is unmaintained 🤷‍♀️
# - RUSTSEC-2023-0052: https://rustsec.org/advisories/RUSTSEC-2023-0052
# - TODO: waiting for fix in dependency
ci-audit = "audit --file Cargo.lock --deny warnings --ignore RUSTSEC-2021-0065 --ignore RUSTSEC-2023-0052"
ci-audit = "audit --file Cargo.lock --deny warnings --ignore RUSTSEC-2021-0065"
4 changes: 4 additions & 0 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ fail-fast = false
retries = 2
test-threads = "num-cpus"
slow-timeout = { period = "60s", terminate-after = 2 }

[[profile.ci.overrides]]
filter = 'test(/^pow::/)'
slow-timeout = "5m"
4 changes: 2 additions & 2 deletions .github/workflows/bindings-nodejs-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ jobs:
with:
python-version: "3.10"

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust
uses: ./.github/actions/setup-rust

# This step can be removed as soon as official Windows arm64 builds are published:
# https://github.com/nodejs/build/issues/2450#issuecomment-705853342
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bindings-wallet-covector-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ jobs:
with:
python-version: "3.10"

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust
uses: ./.github/actions/setup-rust

# This step can be removed as soon as official Windows arm64 builds are published:
# https://github.com/nodejs/build/issues/2450#issuecomment-705853342
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bindings-wasm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust
uses: ./.github/actions/setup-rust
with:
target: "wasm32-unknown-unknown"

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches: [develop, production, 1.1]
paths:
- ".cargo/config.toml"
- ".github/workflows/build-and-test.yml"
- ".github/actions/**"
- "**.rs" # Include all rust files
Expand All @@ -13,6 +14,7 @@ on:
pull_request:
branches: [develop, production, 1.1]
paths:
- ".cargo/config.toml"
- ".github/workflows/build-and-test.yml"
- ".github/actions/**"
- "**.rs" # Include all rust files
Expand Down Expand Up @@ -50,4 +52,4 @@ jobs:
uses: taiki-e/install-action@nextest

- name: Run tests
run: cargo nextest run --all-features --profile ci --cargo-profile ci -p iota-sdk -p iota-sdk-bindings-core
run: cargo ci-test
5 changes: 3 additions & 2 deletions .github/workflows/cli-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,9 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: install rust stable
uses: dtolnay/rust-toolchain@stable

- name: Set up Rust
uses: ./.github/actions/setup-rust

- name: Install required packages (Ubuntu)
if: matrix.os == 'ubuntu-latest'
Expand Down
13 changes: 2 additions & 11 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches: [develop, production, 1.1]
paths:
- ".cargo/config.toml"
- ".github/workflows/coverage.yml"
- ".github/actions/**"
- "coverage.sh"
Expand Down Expand Up @@ -54,16 +55,7 @@ jobs:
uses: "./.github/actions/ledger-nano"

- name: Collect coverage data
run: >
cargo llvm-cov nextest
--lcov
--output-path coverage.info
--tests
--package iota-sdk
--all-features
--run-ignored all
--test-threads "num-cpus"
--retries 2
run: cargo ci-coverage

- name: Tear down private tangle
if: always()
Expand All @@ -73,5 +65,4 @@ jobs:
uses: coverallsapp/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: coverage.info
flag-name: Unit
8 changes: 5 additions & 3 deletions .github/workflows/private-tangle-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches: [develop, production, 1.1]
paths:
- ".cargo/config.toml"
- ".github/workflows/private-tangle-tests.yml"
- ".github/actions/**"
- "**.rs"
Expand All @@ -15,6 +16,7 @@ on:
pull_request:
branches: [develop, production, 1.1]
paths:
- ".cargo/config.toml"
- ".github/workflows/private-tangle-tests.yml"
- ".github/actions/**"
- "**.rs"
Expand Down Expand Up @@ -42,8 +44,8 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Install toolchain
uses: dtolnay/rust-toolchain@stable
- name: Set up Rust
uses: ./.github/actions/setup-rust

- name: Install required packages
run: |
Expand All @@ -63,7 +65,7 @@ jobs:
uses: "./.github/actions/ledger-nano"

- name: Run tests
run: cargo nextest run --tests --all-features --run-ignored ignored-only --profile ci --cargo-profile ci -p iota-sdk -p iota-sdk-bindings-core
run: cargo ci-tangle-test

- name: Tear down private tangle
if: always()
Expand Down
Loading
Loading