Enable actual deployment

davidrg · Jan 31, 2025 · 8138a31 · 8138a31
1 parent 7fed806
commit 8138a31
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1885,7 +1885,9 @@ jobs:
           path: ${{ github.workspace }}\dist\docs\manual
           retention-days: 1
 
-  # Single deploy job since we're just deploying
+  # Deploy the Github Pages website if:
+  #   The branch is master
+  #   Or the tag starts with 'v'
   Deploy-Website:
     environment:
       name: github-pages
@@ -1942,14 +1944,18 @@ jobs:
             echo "have_stable_artifact=no" >> $GITHUB_ENV
           fi
 
+      # If we couldn't fetch the current stable manual from the live github
+      # pages site, then try and fetch the manual artifact from the latest
+      # release instead.
+      # (this is probably something we could just do always
       - name: Fetch Latest Release Manual
         uses: robinraju/release-downloader@v1
         if: needs.Check-Build-Type.outputs.commit-tag == '' && env.have_stable_artifact == 'no'
         with:
           latest: true
           fileName: 'k95-manual-web.zip'
 
-      - name: Process latest release manual
+      - name: Process Latest Release Manual
         shell: bash
         if: needs.Check-Build-Type.outputs.commit-tag == '' && env.have_stable_artifact == 'no'
         run: |
@@ -1995,11 +2001,12 @@ jobs:
         with:
           path: './pages'
 
-# This doesn't currently work properly.
+# TODO: This doesn't currently work properly.
+# If the commit is built before the tag, the deploy won't happen.
 # See:  https://github.com/actions/deploy-pages/issues/383
-#      - name: Deploy to GitHub Pages
-#        id: deployment
-#        uses: actions/deploy-pages@v4
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
 
   # This is the normal version for distribution with the application. HTML
   # files end in .htm, index.htm is the front page of the K95 documentation,

diff --git a/doc/web/index.html b/doc/web/index.html
@@ -24,6 +24,8 @@ <h1>Kermit 95 Documentation</h1>
     <li>IBM OS/2 2.x, Warp 3, Warp 4</li>
 </ul>
 
+<p>For support, you can ask a question <a href="https://github.com/davidrg/ckwin/discussions">on Github Discussions</a></p>
+
 <p>
     For more information:
 </p>
@@ -32,6 +34,14 @@ <h1>Kermit 95 Documentation</h1>
     <li><a href="https://kermitproject.org/ckw10beta.html">The Latest Kermit 95 beta information on kermitproject.org</a></li>
     <li><a href="https://kermitproject.org/k95.html">Information about Kermit 95 2.1.3</a> (from 2003, not open source)</li>
 </ul>
+<p>And these pages from <a href="https://github.com/davidrg/ckwin/wiki">the Wiki</a> may be useful:</p>
+<ul>
+    <li><a href="https://github.com/davidrg/ckwin/wiki/Feature-Comparison">Kermit 95 vs Tera Term and PuTTY</a></li>
+    <li><a href="https://github.com/davidrg/ckwin/wiki/Feature-Comparison:-Windows-HyperTerminal">Kermit 95 vs Windows HyperTerm (9x/NT through XP)</a></li>
+    <li><a href="https://github.com/davidrg/ckwin/wiki/Hyperlinks">Hyperlink support in K95</a></li>
+    <li><a href="https://github.com/davidrg/ckwin/wiki/Terminal-Emulation">Supported Terminal Emulations</a></li>
+    <li><a href="https://github.com/davidrg/ckwin/wiki/Simple-Console-Server">Simple RFC2217 Console Server</a></li>
+</ul>
 <hr>
 </body>
 </html>