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 1.1 into 2.0 #1292

Merged
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/bindings-nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Nodejs bindings checks

on:
push:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".github/actions/**"
- "**.rs" # Include all rust files
Expand All @@ -15,7 +15,7 @@ on:
- "bindings/nodejs/**"
- ".github/workflows/bindings-nodejs.yml"
pull_request:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".github/actions/**"
- "**.rs" # Include all rust files
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bindings-python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
pip install -r requirements-dev.txt
pip install patchelf
pip install maturin
maturin build --out ../../../dist --profile=production
maturin build --out ../../dist --profile=production
- name: Upload wheels
uses: actions/upload-artifact@v3
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/bindings-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Python bindings checks

on:
push:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".github/actions/**"
- "**.rs" # Include all rust files
Expand All @@ -15,7 +15,7 @@ on:
- "bindings/python/**"
- ".github/workflows/bindings-python.yml"
pull_request:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".github/actions/**"
- "**.rs" # Include all rust files
Expand Down Expand Up @@ -120,5 +120,4 @@ jobs:
# TODO temporarily disabled https://github.com/iotaledger/iota-sdk/issues/647
# - name: Run tests
# working-directory: bindings/python
# run: tox

# run: tox
4 changes: 2 additions & 2 deletions .github/workflows/bindings-wasm.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Wasm bindings checks
on:
push:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".github/actions/**"
- "**.rs" # Include all rust files
Expand All @@ -15,7 +15,7 @@ on:
- "bindings/nodejs/**"
- ".github/workflows/bindings-wasm.yml"
pull_request:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".github/actions/**"
- "**.rs" # Include all rust files
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build and Run Tests

on:
push:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".cargo/config.toml"
- ".github/workflows/build-and-test.yml"
Expand All @@ -12,7 +12,7 @@ on:
- "**Cargo.lock" # Include all Cargo.lock files
- "!**/bindings/**" # Exclude all bindings
pull_request:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".cargo/config.toml"
- ".github/workflows/build-and-test.yml"
Expand Down
66 changes: 66 additions & 0 deletions .github/workflows/common-features.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
name: Common Feature Sets
on:
push:
branches: [develop, production, "1.1"]
paths:
- ".cargo/config.toml"
- ".github/workflows/common-features.yml"
- ".github/actions/**"
- "**.rs" # Include all rust files
- "**Cargo.toml" # Include all Cargo.toml files
- "**Cargo.lock" # Include all Cargo.lock files
- "!**/bindings/**" # Exclude all bindings
pull_request:
branches: [develop, production, "1.1"]
paths:
- ".cargo/config.toml"
- ".github/workflows/common-features.yml"
- ".github/actions/**"
- "**.rs" # Include all rust files
- "**Cargo.toml" # Include all Cargo.toml files
- "**Cargo.lock" # Include all Cargo.lock files
- "!**/bindings/**" # Exclude all bindings

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
CARGO_INCREMENTAL: 0

jobs:
common-sets:
name: Check common feature sets
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
set:
- pow
- irc_27
- irc_30
- client,private_key_secret_manager
- client,mqtt
- client,participation
- wallet,storage
- wallet,stronghold
- wallet,rocksdb
- wallet,participation
- wallet,events
- wallet,events,ledger_nano

steps:
- name: Checkout the Source Code
uses: actions/checkout@v3

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

# Required for ledger-nano
- name: Install required packages (Ubuntu)
run: |
sudo apt-get update
sudo apt-get install libudev-dev libusb-1.0-0-dev

- name: Check features [ ${{ matrix.set }} ]
run: cargo check --no-default-features -p iota-sdk -F ${{ matrix.set }}
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test coverage

on:
push:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".cargo/config.toml"
- ".github/workflows/coverage.yml"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Linting
on:
push:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".cargo/config.toml"
- ".github/workflows/lint.yml"
Expand All @@ -11,7 +11,7 @@ on:
- "**Cargo.lock" # Include all Cargo.lock files
- "!**/bindings/**" # Exclude all bindings
pull_request:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".cargo/config.toml"
- ".github/workflows/lint.yml"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/private-tangle-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build and run specific tests on a private tangle

on:
push:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".cargo/config.toml"
- ".github/workflows/private-tangle-tests.yml"
Expand All @@ -14,7 +14,7 @@ on:
- "**Cargo.lock"
- "!cli/**" # Exclude CLI
pull_request:
branches: [develop, production, 2.0]
branches: [develop, production, "2.0"]
paths:
- ".cargo/config.toml"
- ".github/workflows/private-tangle-tests.yml"
Expand Down
Loading
Loading