Skip to content

Commit

Permalink
Merge branch 'develop' into refactor-dashboard/clean-up-dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
marc2332 authored Jan 28, 2025
2 parents fc0f51f + f8e45d8 commit e448f14
Show file tree
Hide file tree
Showing 46 changed files with 8,880 additions and 293 deletions.
17 changes: 16 additions & 1 deletion .github/actions/diffs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,21 @@ outputs:
isRust:
description: True when changes happened to the Rust code
value: "${{ steps.diff.outputs.isRust }}"
isRustExample:
description: True when changes happened to the Rust example code
value: "${{ steps.diff.outputs.isRustExample }}"
isRpc:
description: True when changes happened to the RPC code
value: "${{ steps.diff.outputs.isRpc }}"
isPgIntegration:
description: True when changes happened to the PG integration code
value: "${{ steps.diff.outputs.isPgIntegration }}"
isMove:
description: True when changes happened to the Move code
value: "${{ steps.diff.outputs.isMove }}"
isRosetta:
description: True when changes happened to the rosetta code
value: "${{ steps.diff.outputs.isRosetta }}"
isExternalCrates:
description: True when changes happened in external crates
value: "${{ steps.diff.outputs.isExternalCrates }}"
Expand All @@ -31,7 +43,6 @@ runs:
- "crates/**"
- "external-crates/**"
- "iota-execution/**"
- "docs/examples/rust/**"
- ".github/workflows/hierarchy.yml"
- ".github/workflows/codecov.yml"
- ".github/workflows/_rust.yml"
Expand All @@ -44,6 +55,10 @@ runs:
- "Cargo.lock"
- ".config/nextest.toml"
- "rust-toolchain.toml"
isRustExample:
- "examples/custom-indexer/rust/**"
- "examples/tic-tac-toe/cli/**"
- "docs/examples/rust/**"
isRpc:
- "crates/iota-json-rpc/**"
- "crates/iota-json-rpc-types/**"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_cargo_deny.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

concurrency:
group: cargo-deny-${{ inputs.manifest-path || './Cargo.toml' }}-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

jobs:
bans-licenses-sources:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_docs_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: workflow_call

concurrency:
group: docs-lint-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

jobs:
spelling:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_docusaurus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: workflow_call

concurrency:
group: docusaurus-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:

concurrency:
group: e2e-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

env:
RUST_LOG: warn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_ledgernano.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: workflow_call

concurrency:
group: ledgernano-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

jobs:
ledgernano:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_move_ide.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: workflow_call

concurrency:
group: move-ide-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

jobs:
move-auto-formatter-test:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
inputs:
isRust:
type: boolean
isRustExample:
type: boolean
isPgIntegration:
type: boolean

Expand Down Expand Up @@ -36,6 +38,7 @@ jobs:
uses: ./.github/workflows/_rust_lints.yml
with:
isRust: ${{ inputs.isRust }}
isRustExample: ${{ inputs.isRustExample }}

deny:
uses: ./.github/workflows/_cargo_deny.yml
Expand Down
24 changes: 23 additions & 1 deletion .github/workflows/_rust_lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ on:
inputs:
isRust:
type: boolean
isRustExample:
type: boolean

concurrency:
group: rust-lints-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

env:
CARGO_TERM_COLOR: always
Expand Down Expand Up @@ -45,6 +47,26 @@ jobs:
exit 1 # Fail the workflow
fi
examples:
if: (!cancelled() && inputs.isRustExample)
runs-on: [self-hosted]
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- name: Check examples
# Set the globstar opt here to enable recursive glob.
run: |
shopt -s globstar
for manifest in ./**/examples/**/Cargo.toml; do
echo "Checking format for $manifest"
cargo +nightly ci-fmt --manifest-path $manifest
echo "Clippy linting for $manifest"
cargo clippy --manifest-path $manifest --all-features
echo "Checking unused dependencies of $manifest"
cargo +nightly ci-udeps --manifest-path $manifest
done
clippy:
if: (!cancelled() && !failure() && inputs.isRust)
needs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_typos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: workflow_call

concurrency:
group: typos-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

jobs:
run:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/hierarchy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@ on:

jobs:
diff:
runs-on: [self-hosted]
runs-on: [ubuntu-latest]
concurrency:
group: diff-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
outputs:
isRust: ${{ steps.diff.outputs.isRust }}
isRustExample: ${{ steps.diff.outputs.isRustExample }}
isRpc: ${{ steps.diff.outputs.isRpc }}
isPgIntegration: ${{ steps.diff.outputs.isPgIntegration }}
isMove: ${{ steps.diff.outputs.isMove }}
Expand Down Expand Up @@ -46,7 +47,7 @@ jobs:
runs-on: [self-hosted]
concurrency:
group: dprint-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- name: Check dprint formatting
Expand All @@ -59,7 +60,7 @@ jobs:
name: license-check
concurrency:
group: license-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}
needs: diff
if: (!cancelled() && needs.diff.outputs.isRust == 'true')
runs-on: [self-hosted]
Expand Down Expand Up @@ -108,6 +109,7 @@ jobs:
secrets: inherit
with:
isRust: ${{ needs.diff.outputs.isRust == 'true' }}
isRustExample: ${{ needs.diff.outputs.isRustExample == 'true' }}
isPgIntegration: ${{ needs.diff.outputs.isPgIntegration == 'true' }}

rosetta:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview_wiki.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
cancel-in-progress: ${{ github.ref != 'refs/heads/develop' }}

jobs:
wiki-preview:
Expand Down
Loading

0 comments on commit e448f14

Please sign in to comment.