Fix code broken by merge #4679
Merged
Fix code broken by merge #4679
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The CI pipeline was cancelled due to failure one of the required jobs. |
seadanda
added
R0-silent
yeah.. I run all unit-tests locally for these backports - not doing zombienet or short-benchmarks or lints, but full set of unit-tests (includes most integration tests too) worked so far for me |
|
Yea they all passed for the PRs separately, but I didn't realise a couple of things got clobbered by merging the two. I'll run all the tests and short benchmarks in future for these backports. I thought the protected branches required passing CI to merge too. |
joepetrowski
approved these changes
Jun 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When merging the two backports (#4194 and #4656) for the broker pallet, the priority of the changes seems to have been reversed and ended up with some broken code.
CI doesn't actually run before merging on these release branches so it merged with broken tests.
release-branches are protected so it needs this PR to remove the duplication. Sorry for the noise.