Skip to content
This repository has been archived by the owner on Oct 22, 2024. It is now read-only.

Commit

Permalink
Merge branch 'pallet-xcm-fully-support-reserve-transfers' into update…
Browse files Browse the repository at this point in the history
…-from-adrian

# Conflicts:
#	Cargo.lock
#	cumulus/pallets/dmp-queue/src/lib.rs
#	cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml
#	cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
#	cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs
#	cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
#	cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/xcm_config.rs
  • Loading branch information
claravanstaden authored and claravanstaden committed Nov 6, 2023
2 parents 7119760 + 582c616 commit 578d15b
Show file tree
Hide file tree
Showing 385 changed files with 23,023 additions and 6,815 deletions.
2 changes: 0 additions & 2 deletions .config/zepter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ workflows:
'--features=try-runtime,runtime-benchmarks,std',
# Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
'--left-side-feature-missing=ignore',
# Enabling this feature somehow pulls in two versions of `sp-runtime-interface` and makes it impossible to build that crate with `cargo b -p sp-runtime-interface`. We therefore disable it for now.
'--ignore-missing-propagate=sp-core/std:bandersnatch_vrfs/std',
# Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
'--left-side-outside-workspace=ignore',
# Some features imply that they activate a specific dependency as non-optional. Otherwise the default behaviour with a `?` is used.
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/review-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:

jobs:
trigger-review-bot:
if: github.event.pull_request.draft != true
runs-on: ubuntu-latest
name: trigger review bot
steps:
Expand Down
5 changes: 5 additions & 0 deletions .gitlab/pipeline/short-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ short-benchmark-bridge-hub-rococo:
variables:
RUNTIME_CHAIN: bridge-hub-rococo-dev

short-benchmark-bridge-hub-westend:
<<: *short-bench-cumulus
variables:
RUNTIME_CHAIN: bridge-hub-westend-dev

short-benchmark-collectives-polkadot:
<<: *short-bench-cumulus
variables:
Expand Down
Loading

0 comments on commit 578d15b

Please sign in to comment.