Fix CI back-merge guard handling

Author: alexphillips-dev

.github/workflows/ci.yml

@@ -213,6 +213,8 @@ jobs:
   guard-suite:
     runs-on: ubuntu-latest
     needs: detect-changes
+    env:
+      FVPLUS_ALLOW_PACKAGED_SOURCE_DRIFT: ${{ github.event_name == 'pull_request' && startsWith(github.head_ref, 'backmerge/') && github.base_ref == 'dev' && '1' || '0' }}
     outputs:
       duration_seconds: ${{ steps.elapsed.outputs.seconds }}
 

scripts/build_release_notes.sh

@@ -56,6 +56,8 @@ if [[ -f "${OVERRIDE_FILE}" ]]; then
 
 Install URL: \`https://raw.githubusercontent.com/alexphillips-dev/FolderView-Plus/${INSTALL_BRANCH}/folderview.plus.plg\`
 
+### Changes
+
 $(cat "${OVERRIDE_FILE}")
 EOF
   exit 0

scripts/release_notes_consistency_guard.sh

@@ -28,6 +28,9 @@ const plg = fs.readFileSync(path.join(root, 'folderview.plus.plg'), 'utf8');
 const releaseOnMain = fs.readFileSync(path.join(root, '.github/workflows/release-on-main.yml'), 'utf8');
 const releaseMain = fs.readFileSync(path.join(root, '.github/workflows/release-main.yml'), 'utf8');
 const rendered = fs.readFileSync(outputFile, 'utf8');
+const overridePath = path.join(root, 'docs', 'releases', `${version}.md`);
+const hasOverride = fs.existsSync(overridePath);
+const overrideBody = hasOverride ? fs.readFileSync(overridePath, 'utf8').trim() : '';
 
 const fail = (message) => {
   console.error(`ERROR: ${message}`);
@@ -48,9 +51,18 @@ if (!rendered.includes(`## FolderView Plus ${version}`)) {
 if (!rendered.includes('### Changes')) {
   fail('Generated release notes are missing the changes heading.');
 }
-for (const line of notesBlock.split(/\r?\n/).filter(Boolean)) {
-  if (!rendered.includes(line)) {
-    fail(`Generated release notes are missing CHANGES line: ${line}`);
+if (hasOverride) {
+  if (!overrideBody) {
+    fail(`Curated release override ${path.relative(root, overridePath)} is empty.`);
+  }
+  if (!rendered.includes(overrideBody)) {
+    fail(`Generated release notes are missing the curated override body from ${path.relative(root, overridePath)}.`);
+  }
+} else {
+  for (const line of notesBlock.split(/\r?\n/).filter(Boolean)) {
+    if (!rendered.includes(line)) {
+      fail(`Generated release notes are missing CHANGES line: ${line}`);
+    }
   }
 }
 if (!/bash scripts\/build_release_notes\.sh/.test(releaseOnMain)) {

tests/versioning-guard.test.mjs

@@ -455,6 +455,7 @@ test('release-on-main validates remote raw publish artifacts before publishing r
 test('release notes builder supports curated per-version override files', () => {
     assert.match(buildReleaseNotes, /OVERRIDE_FILE="docs\/releases\/\$\{VERSION\}\.md"/);
     assert.match(buildReleaseNotes, /\[\[ -f "\$\{OVERRIDE_FILE\}" \]\]/);
+    assert.match(buildReleaseNotes, /Install URL:[\s\S]*### Changes[\s\S]*cat "\$\{OVERRIDE_FILE\}"/);
     assert.match(buildReleaseNotes, /cat "\$\{OVERRIDE_FILE\}"/);
 });
 
@@ -594,6 +595,8 @@ test('docs metadata guard keeps readme and packaged descriptions aligned', () =>
     assert.match(buildReleaseNotes, /Install URL: \\`https:\/\/raw\.githubusercontent\.com\/alexphillips-dev\/FolderView-Plus\/\$\{INSTALL_BRANCH\}\/folderview\.plus\.plg\\`/);
     assert.match(buildReleaseNotes, /### Changes/);
     assert.match(releaseNotesConsistencyGuard, /Release notes consistency guard passed/);
+    assert.match(releaseNotesConsistencyGuard, /docs', 'releases', `\$\{version\}\.md`/);
+    assert.match(releaseNotesConsistencyGuard, /Generated release notes are missing the curated override body/);
     assert.match(releaseNotesConsistencyGuard, /mkdir -p "\$\{ROOT_DIR\}\/tmp"/);
     assert.match(releaseNotesConsistencyGuard, /TMP_DIR="\$\(mktemp -d "\$\{ROOT_DIR\}\/tmp\/release-notes-guard\.XXXXXX"\)"/);
     assert.match(releaseNotesConsistencyGuard, /build_release_notes\.sh --version/);