Merge pull request #6 from ajphilton/copilot/fix-github-pages-publish-workflow

ajphilton · web-flow · commit 85362acafa3a · 2025-11-26T12:00:31.000+08:00
Fix GitHub Pages site build and exclude pages from PyPI publish
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,6 +6,10 @@ on:
       - main
     tags:
       - 'v*'
+    paths-ignore:
+      - 'pages/**'
+      - '.github/workflows/pages.yaml'
+      - 'docs/**'
 
 jobs:
   build:
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,3 +2,5 @@ include README.md
 include CHANGELOG.md
 include LICENSE
 recursive-include caddy_tui *.py
+prune pages
+prune docs
diff --git a/pages/build.py b/pages/build.py
@@ -42,19 +42,18 @@
 
 
 # Extract meta tags, schema.org, and Open Graph from META.md
-meta_tags = []
-schema_org = []
 open_graph = []
+schema_org_match = re.search(r'(<script\s+type="application/ld\+json">[\s\S]*?</script>)', meta_md)
+schema_org_html = schema_org_match.group(1) if schema_org_match else ""
+
 for line in meta_md.splitlines():
-    if line.strip().startswith('<meta '):
-        meta_tags.append(line.strip())
-    elif line.strip().startswith('<script '):
-        schema_org.append(line.strip())
-    elif line.strip().startswith('<meta property="og:'):
+    if line.strip().startswith('<meta property="og:'):
         open_graph.append(line.strip())
 
 # Compose meta head HTML
-meta_head_html = '\n'.join(meta_tags + schema_org + open_graph)
+meta_head_html = '\n'.join(open_graph)
+if schema_org_html:
+    meta_head_html = meta_head_html + '\n' + schema_org_html if meta_head_html else schema_org_html
 
 
 # Convert markdown to HTML for README sections
diff --git a/pages/index.html b/pages/index.html
@@ -5,16 +5,14 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>caddy-tui Pages Site</title>
+    <!-- META_HEAD -->
     <link rel="stylesheet" href="style.css">
     <link rel="icon" type="image/svg+xml" href="assets/favicon.svg">
 </head>
 
 <body>
     <div class="container">
         <h1>caddy-tui</h1>
-        <section id="meta">
-            <!-- Meta info from META.md will be inserted here by build script -->
-        </section>
         <section id="readme-intro">
             <!-- README intro will be inserted here by build script -->
         </section>
@@ -27,4 +25,4 @@ <h1>caddy-tui</h1>
     </div>
 </body>
 
-</html>
+</html>
diff --git a/pages/style.css b/pages/style.css
@@ -1,11 +1,11 @@
-h1, h2, h3 {
 body {
     font-family: 'Inter', 'Segoe UI', 'Helvetica Neue', Arial, sans-serif;
     background: #f6f5ec;
     color: #222e3a;
     margin: 0;
     padding: 0;
 }
+h1, h2, h3 {
     color: #2456a6;
     font-family: 'Inter', 'Segoe UI', 'Helvetica Neue', Arial, sans-serif;
     font-weight: 700;
