update

Author: monapdx

src/lib/__tests__/repoSiteBootstrap.test.js

@@ -3,6 +3,7 @@ import { PAGES_WORKFLOW } from '../blogPaths'
 import {
   buildPagesWorkflowYaml,
   formatBootstrapStatusMessage,
+  workflowNeedsEnablementUpdate,
 } from '../repoSiteBootstrap'
 import { READ_ONLY_TEMPLATES } from '../readOnlyTemplates'
 
@@ -12,12 +13,22 @@ describe('buildPagesWorkflowYaml', () => {
     expect(yml).toContain('path: ./blog')
     expect(yml).toContain('branches: [main]')
     expect(yml).toContain('configure-pages@v5')
+    expect(yml).toContain('enablement: true')
     expect(yml).toContain('name: Upload blog artifact')
     expect(READ_ONLY_TEMPLATES.githubPagesWorkflowYaml).toContain('./blog')
     expect(PAGES_WORKFLOW).toBe('.github/workflows/deploy-blog-pages.yml')
   })
 })
 
+describe('workflowNeedsEnablementUpdate', () => {
+  it('flags workflows without enablement: true', () => {
+    expect(workflowNeedsEnablementUpdate('uses: actions/configure-pages@v5')).toBe(true)
+    expect(
+      workflowNeedsEnablementUpdate('configure-pages@v5\n        with:\n          enablement: true'),
+    ).toBe(false)
+  })
+})
+
 describe('formatBootstrapStatusMessage', () => {
   it('lists created and found paths', () => {
     const msg = formatBootstrapStatusMessage([

src/lib/repoSiteBootstrap.js

@@ -35,12 +35,71 @@ export function formatBootstrapStatusMessage(fileLog) {
     .join(' · ')
 }
 
+const WORKFLOW_ENABLEMENT_RE = /enablement:\s*true\b/
+
 export function buildPagesWorkflowYaml(branch = 'main') {
   const b = String(branch ?? '').trim() || 'main'
   const branchRef = /^[a-zA-Z0-9._/-]+$/.test(b) ? b : `"${b.replace(/"/g, '\\"')}"`
   return READ_ONLY_TEMPLATES.githubPagesWorkflowYaml.replace(/\{\{BRANCH\}\}/g, branchRef)
 }
 
+export function workflowNeedsEnablementUpdate(existingYaml) {
+  return !WORKFLOW_ENABLEMENT_RE.test(String(existingYaml ?? ''))
+}
+
+async function ensurePagesWorkflow({ token, owner, repo, branch, fileLog }) {
+  const content = buildPagesWorkflowYaml(branch)
+  const existingSha = await getFileSha({ token, owner, repo, path: PAGES_WORKFLOW, branch })
+
+  if (existingSha) {
+    try {
+      const existing = await fetchRepoFileText({ token, owner, repo, path: PAGES_WORKFLOW, branch })
+      if (!workflowNeedsEnablementUpdate(existing.text)) {
+        fileLog.push({ path: PAGES_WORKFLOW, status: 'found' })
+        return { workflowOk: true, workflowWarning: null }
+      }
+      await upsertFile({
+        token,
+        owner,
+        repo,
+        path: PAGES_WORKFLOW,
+        branch,
+        content,
+        message: 'Update GitHub Pages workflow (enable Pages)',
+        sha: existing.sha,
+      })
+      fileLog.push({ path: PAGES_WORKFLOW, status: 'created' })
+      return { workflowOk: true, workflowWarning: null }
+    } catch {
+      fileLog.push({ path: PAGES_WORKFLOW, status: 'failed' })
+      return { workflowOk: false, workflowWarning: WORKFLOW_PERMISSION_WARNING }
+    }
+  }
+
+  try {
+    await upsertFile({
+      token,
+      owner,
+      repo,
+      path: PAGES_WORKFLOW,
+      branch,
+      content,
+      message: 'Add GitHub Pages workflow for blog/',
+      sha: null,
+    })
+    const verified = await getFileSha({ token, owner, repo, path: PAGES_WORKFLOW, branch })
+    if (verified) {
+      fileLog.push({ path: PAGES_WORKFLOW, status: 'created' })
+      return { workflowOk: true, workflowWarning: null }
+    }
+    fileLog.push({ path: PAGES_WORKFLOW, status: 'failed' })
+    return { workflowOk: false, workflowWarning: WORKFLOW_PERMISSION_WARNING }
+  } catch {
+    fileLog.push({ path: PAGES_WORKFLOW, status: 'failed' })
+    return { workflowOk: false, workflowWarning: WORKFLOW_PERMISSION_WARNING }
+  }
+}
+
 async function recordFile({ token, owner, repo, branch, path, content, message, fileLog }) {
   const sha = await getFileSha({ token, owner, repo, path, branch })
   if (sha) {
@@ -152,36 +211,9 @@ export async function bootstrapBlogSite({ token, owner, repo, branch }) {
     indexModified = prep.modified
   }
 
-  // Workflow lives at repo root (.github/workflows/…), not under blog/
-  const workflowSha = await getFileSha({ token, owner, repo, path: PAGES_WORKFLOW, branch })
-  if (workflowSha) {
-    fileLog.push({ path: PAGES_WORKFLOW, status: 'found' })
-    workflowOk = true
-  } else {
-    try {
-      await upsertFile({
-        token,
-        owner,
-        repo,
-        path: PAGES_WORKFLOW,
-        branch,
-        content: buildPagesWorkflowYaml(branch),
-        message: 'Add GitHub Pages workflow for blog/',
-        sha: null,
-      })
-      const verified = await getFileSha({ token, owner, repo, path: PAGES_WORKFLOW, branch })
-      if (verified) {
-        fileLog.push({ path: PAGES_WORKFLOW, status: 'created' })
-        workflowOk = true
-      } else {
-        fileLog.push({ path: PAGES_WORKFLOW, status: 'failed' })
-        workflowWarning = WORKFLOW_PERMISSION_WARNING
-      }
-    } catch {
-      fileLog.push({ path: PAGES_WORKFLOW, status: 'failed' })
-      workflowWarning = WORKFLOW_PERMISSION_WARNING
-    }
-  }
+  const workflowResult = await ensurePagesWorkflow({ token, owner, repo, branch, fileLog })
+  workflowOk = workflowResult.workflowOk
+  workflowWarning = workflowResult.workflowWarning
 
   return {
     indexText,

templates/github-pages-blog.yml

@@ -28,6 +28,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Setup Pages
         uses: actions/configure-pages@v5
+        with:
+          enablement: true
       - name: Upload blog artifact
         uses: actions/upload-pages-artifact@v3
         with: