Skip to content

Commit

Permalink
Merge branch 'master' into alistair/support-eth
Browse files Browse the repository at this point in the history
  • Loading branch information
alistair-singh authored Dec 21, 2024
2 parents e1a6f18 + d0c8a07 commit 5b50f11
Show file tree
Hide file tree
Showing 735 changed files with 9,590 additions and 8,730 deletions.
7 changes: 7 additions & 0 deletions .config/taplo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,10 @@ keys = ["workspace.dependencies"]

[rule.formatting]
reorder_keys = true

[[rule]]
include = ["**/Cargo.toml"]
keys = ["build-dependencies", "dependencies", "dev-dependencies"]

[rule.formatting]
reorder_keys = true
1 change: 0 additions & 1 deletion .github/scripts/common/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ fetch_release_artifacts_from_s3() {
pwd
ls -al --color
popd > /dev/null
unset OUTPUT_DIR
}

# Pass the name of the binary as input, it will
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/cmd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,14 @@ jobs:
name: command-output
path: /tmp/cmd/command_output.log

# Generate token for commit, as the earlier token expires after 1 hour, while cmd can take longer
- name: Generate token for commit
uses: actions/create-github-app-token@v1
id: generate_token_commit
with:
app-id: ${{ secrets.CMD_BOT_APP_ID }}
private-key: ${{ secrets.CMD_BOT_APP_KEY }}

- name: Commit changes
run: |
if [ -n "$(git status --porcelain)" ]; then
Expand All @@ -410,7 +418,7 @@ jobs:
# Push the results to the target branch
git remote add \
github \
"https://token:${{ steps.generate_token.outputs.token }}@github.com/${{ github.event.repository.owner.login }}/${{ github.event.repository.name }}.git" || :
"https://x-access-token:${{ steps.generate_token_commit.outputs.token }}@github.com/${{ needs.get-pr-branch.outputs.repo }}.git" || :
push_changes() {
git push github "HEAD:${{ needs.get-pr-branch.outputs.pr-branch }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-check-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
preflight:
uses: ./.github/workflows/reusable-preflight.yml

check-publish:
check-publish-compile:
timeout-minutes: 90
needs: [preflight]
runs-on: ${{ needs.preflight.outputs.RUNNER }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-50_publish-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ on:
required: true

stable_tag:
description: Tag matching the actual stable release version in the format stableYYMM or stableYYMM-X for patch releases
description: Tag matching the actual stable release version in the format polkadpt-stableYYMM(-rcX) or plkadot-stableYYMM-X(-rcX) for patch releases
required: true

permissions:
Expand Down Expand Up @@ -311,9 +311,9 @@ jobs:
# TODO: The owner should be used below but buildx does not resolve the VARs
# TODO: It would be good to get rid of this GHA that we don't really need.
tags: |
egorpop/polkadot:${{ steps.fetch-data.outputs.stable }}
egorpop/polkadot:latest
egorpop/polkadot:${{ needs.fetch-latest-debian-package-version.outputs.polkadot_container_tag }}
parity/polkadot:${{ steps.fetch-data.outputs.stable }}
parity/polkadot:latest
parity/polkadot:${{ needs.fetch-latest-debian-package-version.outputs.polkadot_container_tag }}
build-args: |
VCS_REF=${{ github.ref }}
POLKADOT_VERSION=${{ needs.fetch-latest-debian-package-version.outputs.polkadot_apt_version }}
Expand Down
98 changes: 5 additions & 93 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions bridges/chains/chain-bridge-hub-cumulus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ workspace = true
[dependencies]
# Bridge Dependencies

bp-polkadot-core = { workspace = true }
bp-messages = { workspace = true }
bp-polkadot-core = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Based Dependencies

frame-system = { workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
sp-api = { workspace = true }
sp-std = { workspace = true }

Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-kusama/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ workspace = true
# Bridge Dependencies

bp-bridge-hub-cumulus = { workspace = true }
bp-runtime = { workspace = true }
bp-messages = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Based Dependencies

Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-polkadot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ workspace = true
# Bridge Dependencies

bp-bridge-hub-cumulus = { workspace = true }
bp-runtime = { workspace = true }
bp-messages = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Based Dependencies

Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-rococo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ codec = { features = ["derive"], workspace = true }

# Bridge Dependencies
bp-bridge-hub-cumulus = { workspace = true }
bp-runtime = { workspace = true }
bp-messages = { workspace = true }
bp-runtime = { workspace = true }
bp-xcm-bridge-hub = { workspace = true }

# Substrate Based Dependencies
Expand Down
2 changes: 1 addition & 1 deletion bridges/chains/chain-bridge-hub-westend/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ codec = { features = ["derive"], workspace = true }

# Bridge Dependencies
bp-bridge-hub-cumulus = { workspace = true }
bp-runtime = { workspace = true }
bp-messages = { workspace = true }
bp-runtime = { workspace = true }
bp-xcm-bridge-hub = { workspace = true }

# Substrate Based Dependencies
Expand Down
4 changes: 2 additions & 2 deletions bridges/modules/beefy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ sp-runtime = { workspace = true }
sp-std = { workspace = true }

[dev-dependencies]
sp-consensus-beefy = { workspace = true, default-features = true }
bp-test-utils = { workspace = true, default-features = true }
mmr-lib = { workspace = true }
pallet-beefy-mmr = { workspace = true, default-features = true }
pallet-mmr = { workspace = true, default-features = true }
rand = { workspace = true, default-features = true }
sp-consensus-beefy = { workspace = true, default-features = true }
sp-io = { workspace = true, default-features = true }
bp-test-utils = { workspace = true, default-features = true }

[features]
default = ["std"]
Expand Down
2 changes: 1 addition & 1 deletion bridges/modules/grandpa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ scale-info = { features = ["derive"], workspace = true }

# Bridge Dependencies

bp-runtime = { workspace = true }
bp-header-chain = { workspace = true }
bp-runtime = { workspace = true }

# Substrate Dependencies

Expand Down
2 changes: 1 addition & 1 deletion bridges/modules/messages/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ bp-runtime = { features = ["test-helpers"], workspace = true }
bp-test-utils = { workspace = true }
pallet-balances = { workspace = true }
pallet-bridge-grandpa = { workspace = true }
sp-io = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }

[features]
default = ["std"]
Expand Down
8 changes: 4 additions & 4 deletions bridges/modules/relayers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ sp-runtime = { workspace = true }
sp-std = { workspace = true }

[dev-dependencies]
bp-runtime = { workspace = true }
pallet-balances = { workspace = true, default-features = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }
bp-parachains = { workspace = true }
bp-polkadot-core = { workspace = true }
bp-runtime = { workspace = true }
bp-test-utils = { workspace = true }
pallet-balances = { workspace = true, default-features = true }
pallet-utility = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }

[features]
default = ["std"]
Expand Down
8 changes: 4 additions & 4 deletions bridges/modules/xcm-bridge-hub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ xcm-builder = { workspace = true }
xcm-executor = { workspace = true }

[dev-dependencies]
pallet-balances = { workspace = true }
sp-io = { workspace = true }
bp-runtime = { workspace = true }
bp-header-chain = { workspace = true }
pallet-xcm-bridge-hub-router = { workspace = true }
bp-runtime = { workspace = true }
bp-xcm-bridge-hub-router = { workspace = true }
pallet-balances = { workspace = true }
pallet-xcm-bridge-hub-router = { workspace = true }
polkadot-parachain-primitives = { workspace = true }
sp-io = { workspace = true }

[features]
default = ["std"]
Expand Down
Loading

0 comments on commit 5b50f11

Please sign in to comment.