Fix dev branch validation in back-merge workflow

Author: alexphillips-dev

.github/workflows/backmerge-main-to-dev.yml

@@ -37,6 +37,7 @@ jobs:
 
       - name: Validate merged dev state before push
         env:
+          FVPLUS_EXPECT_PLUGIN_BRANCH: 'dev'
           FVPLUS_UNRAID_MATRIX: ${{ secrets.FVPLUS_UNRAID_MATRIX }}
           FVPLUS_I18N_STRICT: '1'
           FVPLUS_DEAD_CODE_STRICT: '1'

scripts/workflow_self_check.sh

@@ -82,6 +82,9 @@ if (/gh release create/.test(releaseMainWorkflow) || /gh release edit/.test(rele
 if (!/upload-artifact@v4/.test(backmergeWorkflow)) {
   fail('Back-merge workflow must upload debug artifacts on failure.');
 }
+if (!/FVPLUS_EXPECT_PLUGIN_BRANCH:\s*'dev'/.test(backmergeWorkflow)) {
+  fail('Back-merge workflow must validate merged dev state with FVPLUS_EXPECT_PLUGIN_BRANCH set to dev.');
+}
 
 for (const workflowPath of [
   '.github/workflows/ci.yml',

tests/versioning-guard.test.mjs

@@ -350,6 +350,7 @@ test('validation workflows delegate to the shared ci suite with dev coverage, fa
     }
 
     assert.match(backmergeWorkflow, /Validate merged dev state before push/);
+    assert.match(backmergeWorkflow, /FVPLUS_EXPECT_PLUGIN_BRANCH:\s*'dev'/);
     assert.match(backmergeWorkflow, /bash scripts\/run_ci_suite\.sh/);
     assert.match(backmergeWorkflow, /Setup CI environment/);
     assert.match(backmergeWorkflow, /uses:\s*\.\/\.github\/actions\/setup-ci-env/);