From 7f5699b8a92af791294640d0df097bac709bb70d Mon Sep 17 00:00:00 2001 From: Manuel Mauro Date: Mon, 18 May 2026 14:49:51 +0300 Subject: [PATCH 1/2] docs(moonbeam-engineering): add compile-with-tests step to cherry-pick verification The qa-cherry-picks verification flow confirmed cherry-picks via git but never checked the fork branch still built. Add a step requiring `cargo check --workspace --tests`, and document why `--tests` is mandatory: plain `cargo check --workspace` skips `#[cfg(test)]` modules and integration tests, so a broken test module can ride along undetected (as evm's `delegation.rs` did across stable branches). --- .../qa-cherry-picks/verify-cherry-picks.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/moonbeam-engineering/skills/qa-cherry-picks/verify-cherry-picks.md b/moonbeam-engineering/skills/qa-cherry-picks/verify-cherry-picks.md index 4eb3ee3..e6bcbb3 100644 --- a/moonbeam-engineering/skills/qa-cherry-picks/verify-cherry-picks.md +++ b/moonbeam-engineering/skills/qa-cherry-picks/verify-cherry-picks.md @@ -20,3 +20,20 @@ Upstream remotes by repo: | moonkit | moonbeam-foundation/moonkit (origin) | Moonsong-Labs/moonkit (branch: `main`) | Then for each "Included" row, confirm the commit exists on the branch. For each "Dropped" row, confirm it does not. + +## Verify the branch compiles + +After confirming the cherry-picks are present, check that the fork branch still +builds — **including test code**: + +```bash +cargo check --workspace --tests +``` + +Always pass `--tests`. Plain `cargo check --workspace` skips `#[cfg(test)]` +modules and integration tests, so a cherry-pick — or an upstream refactor the +cherry-pick lands on top of — can leave a test module that no longer compiles +while the check still reports success. This bit us in the stable2603 cycle: +evm's `evm-core` `delegation.rs` test module had been broken since an +`Option`→`Result` API refactor, and a `--tests`-less check let it ride along +undetected from one stable branch to the next. From bf3da735dc63f55df299c52619de5b57eb724bf0 Mon Sep 17 00:00:00 2001 From: Manuel Mauro <9842640+manuelmauro@users.noreply.github.com> Date: Mon, 18 May 2026 14:58:42 +0200 Subject: [PATCH 2/2] Update moonbeam-engineering/skills/qa-cherry-picks/verify-cherry-picks.md Co-authored-by: Rodrigo Quelhas <22591718+RomarQ@users.noreply.github.com> --- .../skills/qa-cherry-picks/verify-cherry-picks.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/moonbeam-engineering/skills/qa-cherry-picks/verify-cherry-picks.md b/moonbeam-engineering/skills/qa-cherry-picks/verify-cherry-picks.md index e6bcbb3..0298324 100644 --- a/moonbeam-engineering/skills/qa-cherry-picks/verify-cherry-picks.md +++ b/moonbeam-engineering/skills/qa-cherry-picks/verify-cherry-picks.md @@ -31,9 +31,4 @@ cargo check --workspace --tests ``` Always pass `--tests`. Plain `cargo check --workspace` skips `#[cfg(test)]` -modules and integration tests, so a cherry-pick — or an upstream refactor the -cherry-pick lands on top of — can leave a test module that no longer compiles -while the check still reports success. This bit us in the stable2603 cycle: -evm's `evm-core` `delegation.rs` test module had been broken since an -`Option`→`Result` API refactor, and a `--tests`-less check let it ride along -undetected from one stable branch to the next. +modules and integration tests.