Update to support MC100

jordancarlin · jordancarlin · commit 9fec43c5d39c · 2026-03-04T16:07:55.000-08:00
diff --git a/.github/workflows/release-docs.yml b/.github/workflows/release-docs.yml
@@ -55,17 +55,17 @@ jobs:
       - name: Build CRD
         run: cd docs/crd && make -j2
 
-      - name: Upload CRD PDF
+      - name: Upload CRD PDFs
         uses: actions/upload-artifact@v6
         with:
-          name: rvi20_crd.pdf
-          path: docs/crd/build/rvi20_crd.pdf
+          name: crd-pdf
+          path: docs/crd/build/*.pdf
 
-      - name: Upload CRD HTML
+      - name: Upload CRD HTMLs
         uses: actions/upload-artifact@v6
         with:
-          name: rvi20_crd.html
-          path: docs/crd/build/rvi20_crd.html
+          name: crd-html
+          path: docs/crd/build/*.html
 
   release:
     needs: [build-ctp, build-crd]
@@ -83,16 +83,16 @@ jobs:
           name: ctp.html
           path: ./
 
-      - name: Download CRD PDF
+      - name: Download CRD PDFs
         uses: actions/download-artifact@v7
         with:
-          name: rvi20_crd.pdf
+          name: crd-pdf
           path: ./
 
-      - name: Download CRD HTML
+      - name: Download CRD HTMLs
         uses: actions/download-artifact@v7
         with:
-          name: rvi20_crd.html
+          name: crd-html
           path: ./
 
       - name: Get current date
@@ -114,6 +114,8 @@ jobs:
             ctp.html
             rvi20_crd.pdf
             rvi20_crd.html
+            mc100_crd.pdf
+            mc100_crd.html
 
   deploy-pages:
     needs: [build-ctp, build-crd]
@@ -122,43 +124,26 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
+      - uses: actions/checkout@v6
+        with:
+          sparse-checkout: docs/pages
+
       - name: Download CTP HTML
         uses: actions/download-artifact@v7
         with:
           name: ctp.html
-          path: ./github-pages/ctp
+          path: docs/pages
 
-      - name: Download CRD HTML
+      - name: Download CRD HTMLs
         uses: actions/download-artifact@v7
         with:
-          name: rvi20_crd.html
-          path: ./github-pages/crd
-
-      - name: Rename HTML files to index.html
-        run: |
-          mv ./github-pages/ctp/ctp.html ./github-pages/ctp/index.html
-          mv ./github-pages/crd/rvi20_crd.html ./github-pages/crd/index.html
-
-      - name: Create index page
-        run: |
-          cat > ./github-pages/index.html << 'EOF'
-          <!DOCTYPE html>
-          <html>
-          <head><title>RISC-V Certification Documentation</title></head>
-          <body>
-          <h1>RISC-V Certification Documentation</h1>
-          <ul>
-            <li><a href="ctp/">Certification Test Plan (CTP)</a></li>
-            <li><a href="crd/">Certification Requirements Document (CRD)</a></li>
-          </ul>
-          </body>
-          </html>
-          EOF
+          name: crd-html
+          path: docs/pages/crd
 
       - name: Upload pages artifact
         uses: actions/upload-pages-artifact@v4
         with:
-          path: github-pages
+          path: docs/pages
 
       - name: Deploy to GitHub Pages
         id: deployment
diff --git a/docs/crd/src/mc100_crd.adoc b/docs/crd/src/mc100_crd.adoc
@@ -1,6 +1,6 @@
 = MC100 Certification Requirements Document (rev 0.1)
-include::adoc_common.adoc[]
 :description: MC100 CRD (Certificate Requirements Document)
+include::../../common/adoc_common.adoc[]
 
 _Contributors to all versions of the spec in alphabetical order_
 
diff --git a/docs/ctp/Makefile b/docs/ctp/Makefile
@@ -1,4 +1,4 @@
-# Makefile for RISC-V Conformance Test Plan (CTP)
+# Makefile for RISC-V Certification Test Plan (CTP)
 #
 # This work is licensed under the Creative Commons Attribution-ShareAlike 4.0
 # International License. To view a copy of this license, visit
diff --git a/docs/pages/crd/index.html b/docs/pages/crd/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html>
+  <head>
+    <title>RISC-V CRDs</title>
+  </head>
+  <body>
+    <h1>Certification Requirements Documents</h1>
+    <ul>
+      <li><a href="rvi20_crd.html">RVI20 CRD</a></li>
+      <li><a href="mc100_crd.html">MC100 CRD</a></li>
+    </ul>
+  </body>
+</html>
diff --git a/docs/pages/index.html b/docs/pages/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html>
+  <head>
+    <title>RISC-V Certification Documentation</title>
+  </head>
+  <body>
+    <h1>RISC-V Certification Documentation</h1>
+    <ul>
+      <li><a href="ctp.html">Certification Test Plan (CTP)</a></li>
+      <li><a href="crd/">Certification Requirements Documents (CRDs)</a></li>
+    </ul>
+  </body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Makefile for RISC-V Conformance Test Plan (CTP)`
	`1`	`+# Makefile for RISC-V Certification Test Plan (CTP)`
`2`	`2`	`#`
`3`	`3`	`# This work is licensed under the Creative Commons Attribution-ShareAlike 4.0`
`4`	`4`	`# International License. To view a copy of this license, visit`