Skip to content

Commit

Permalink
Merge pull request #1356 from iotaledger/1.1
Browse files Browse the repository at this point in the history
Merge 1.1 into develop
  • Loading branch information
thibault-martinez authored Sep 29, 2023
2 parents ccd2470 + 35678d0 commit c7eea31
Show file tree
Hide file tree
Showing 217 changed files with 9,098 additions and 5,134 deletions.
9 changes: 7 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]
branches: [develop, production, "1.1"]
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]
branches: [develop, production, "1.1"]
paths:
- ".github/actions/**"
- "**.rs" # Include all rust files
Expand Down Expand Up @@ -94,6 +94,11 @@ jobs:
yarn
yarn build
- name: Test types module webpack compatibility
working-directory: bindings/nodejs/
run: |
yarn run test-webpack
lint:
name: Lint
if: ${{ ! github.event.schedule }}
Expand Down
20 changes: 13 additions & 7 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]
branches: [develop, production, "1.1"]
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]
branches: [develop, production, "1.1"]
paths:
- ".github/actions/**"
- "**.rs" # Include all rust files
Expand All @@ -40,7 +40,7 @@ concurrency:

jobs:
lint:
name: PEP8 style check
name: Python PEP8 format
runs-on: ubuntu-latest
strategy:
fail-fast: false
Expand All @@ -63,12 +63,13 @@ jobs:
python3 -m pip install --upgrade setuptools pip wheel
python3 -m pip install tox-gh-actions
- name: Run Tox
- name: Run tox format check
working-directory: bindings/python
run: tox -e lint
run: tox -e format


test:
name: Test
name: Linter & Tests
needs: lint
if: ${{ ! github.event.schedule }}
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -111,6 +112,11 @@ jobs:
sudo apt-get update
sudo apt-get install libudev-dev libusb-1.0-0-dev
- name: Run Tox
- name: Run linter for examples
if: ${{ startsWith(matrix.os, 'ubuntu-latest') }}
working-directory: bindings/python
run: tox -e lint-examples

- name: Run tests
working-directory: bindings/python
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]
branches: [develop, production, "1.1"]
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]
branches: [develop, production, "1.1"]
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]
branches: [develop, production, "1.1"]
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]
branches: [develop, production, "1.1"]
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]
branches: [develop, production, "1.1"]
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]
branches: [develop, production, "1.1"]
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]
branches: [develop, production, "1.1"]
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]
branches: [develop, production, "1.1"]
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]
branches: [develop, production, "1.1"]
paths:
- ".cargo/config.toml"
- ".github/workflows/private-tangle-tests.yml"
Expand Down
Loading

0 comments on commit c7eea31

Please sign in to comment.