Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix code broken by merge #4679

Merged
merged 1 commit into from
Jun 3, 2024

Conversation

seadanda
Copy link
Contributor

@seadanda seadanda commented Jun 3, 2024

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.

@seadanda seadanda requested a review from eskimor June 3, 2024 13:18
@seadanda seadanda requested a review from a team as a code owner June 3, 2024 13:18
@paritytech-cicd-pr
Copy link

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: cargo-clippy
Logs: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/6383069

@seadanda seadanda added R0-silent Changes should not be mentioned in any release notes T2-pallets This PR/Issue is related to a particular pallet. labels Jun 3, 2024
@acatangiu
Copy link
Contributor

CI doesn't actually run before merging on these release branches so it merged with broken tests.

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

@seadanda
Copy link
Contributor Author

seadanda commented Jun 3, 2024

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.

@seadanda seadanda merged commit bf8632a into release-polkadot-v1.7.3 Jun 3, 2024
27 of 115 checks passed
@seadanda seadanda deleted the fix-release-polkadot-v1.7.3 branch June 3, 2024 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
R0-silent Changes should not be mentioned in any release notes T2-pallets This PR/Issue is related to a particular pallet.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants