redhat-documentation
diff --git a/‎.github/workflows/preview-build.yml‎
Lines changed: 25 additions & 17 deletions b/‎.github/workflows/preview-build.yml‎
Lines changed: 25 additions & 17 deletions
diff --git a/‎.github/workflows/preview-deploy.yml‎
Lines changed: 6 additions & 6 deletions b/‎.github/workflows/preview-deploy.yml‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎.github/workflows/publication-builder.yml‎
Lines changed: 0 additions & 39 deletions b/‎.github/workflows/publication-builder.yml‎
Lines changed: 0 additions & 39 deletions
diff --git a/‎.github/workflows/publish-gh-pages.yml‎
Lines changed: 60 additions & 0 deletions b/‎.github/workflows/publish-gh-pages.yml‎
Lines changed: 60 additions & 0 deletions
diff --git a/‎.gitignore‎
Lines changed: 6 additions & 0 deletions b/‎.gitignore‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎.htmltest.yml‎
Lines changed: 3 additions & 1 deletion b/‎.htmltest.yml‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎.readthedocs.yaml‎
Lines changed: 0 additions & 20 deletions b/‎.readthedocs.yaml‎
Lines changed: 0 additions & 20 deletions
diff --git a/‎antora-playbook.yml‎
Lines changed: 0 additions & 53 deletions b/‎antora-playbook.yml‎
Lines changed: 0 additions & 53 deletions
diff --git a/‎antora.yml‎
Lines changed: 0 additions & 39 deletions b/‎antora.yml‎
Lines changed: 0 additions & 39 deletions
@@ -16,6 +16,7 @@
 name: Preview build
 on:
   - pull_request
+
 jobs:
   preview-build:
     name: Preview build
@@ -26,51 +27,58 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0 # enable git diff and building many branches
-      - name: Install Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
+
+      - name: Set up Ruby (for Asciidoctor CLI)
+        uses: ruby/setup-ruby@v1
         with:
-          node-version: '18'
-      - name: Install Antora
-        run: npm i antora @antora/lunr-extension
+          ruby-version: "3.2"
+          bundler-cache: false
+
+      - name: Install Asciidoctor + Rouge
+        run: gem install --no-document asciidoctor rouge
+
+      - name: Install Python deps
+        run: |
+          python -m pip install -U pip
+          pip install mkdocs mkdocs-material mkdocs-callouts mkdocs-asciidoctor-backend
+
+      - name: Build MkDocs site
+        run: |
+          python -m mkdocs build -f mkdocs.yml
+
       - name: Get yearweek for cache
         id: get-date # used below
         run: echo "yearweek=$(/bin/date -u "+%Y%U")" >> $GITHUB_OUTPUT
         shell: bash
+
       - name: Restore cache
         uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.3
         env:
           cache-name: cache
         with:
           path: .cache
           key: ${{ steps.get-date.outputs.yearweek }}
-      - name: Install Vale and validate
-        run: |
-          sudo gem install asciidoctor
-          curl -s https://api.github.com/repos/errata-ai/vale/releases/latest | grep "browser_download_url.*Linux_64-bit.tar.gz" | cut -d : -f 2,3 | tr -d \" | wget -qi -
-          mkdir bin && tar -xvzf *Linux_64-bit.tar.gz -C bin
-          export PATH=./bin:"$PATH"
-          vale -v
-          tools/validate-language-changes.sh
-      - name: Generate Site
-        run: npx antora antora-playbook.yml
+
       - name: Store pull request details for preview-publish
         run: |
           echo "${{ github.event.number }}" > PR_NUMBER
           echo "${{ github.event.pull_request.head.sha }}" > PR_SHA
+
       - name: Upload preview-build artifact
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: preview-build
           path: |
-            build
+            public
             PR_NUMBER
             PR_SHA
           retention-days: 7
       - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.0.3
         with:
           path: tmp/.htmltest
           key: ${{ runner.os }}-htmltest
+
       - name: Validate internal and external links
         run: |
           curl https://htmltest.wjdp.uk | bash
-          bin/htmltest
+          bin/htmltest
@@ -29,16 +29,16 @@ jobs:
       - name: Set variables
         id: vars
         run: |
-          echo "pr_number=$(<PR_NUMBER)" >> $GITHUB_OUTPUT
-          echo "pr_sha=$(<PR_SHA)" >> $GITHUB_OUTPUT
-          echo "deploy_domain=$(echo ${{ github.repository }}-$(<PR_NUMBER).surge.sh | sed s#/#-#)" >> $GITHUB_OUTPUT
-          echo "project=$(find build/ -mindepth 1 -maxdepth 1  -type d)" >> $GITHUB_OUTPUT
+          echo "pr_number=$(cat PR_NUMBER)" >> $GITHUB_OUTPUT
+          echo "pr_sha=$(cat PR_SHA)" >> $GITHUB_OUTPUT
+          echo "deploy_domain=$(echo ${{ github.repository }}-$(cat PR_NUMBER).surge.sh | sed 's#/#-#')" >> $GITHUB_OUTPUT
       - name: Deploy
         id: deploy
         env:
           SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }}
         run: |
-          npx surge --project ${{ steps.vars.outputs.project }} --domain ${{ steps.vars.outputs.deploy_domain }} --token ${{ secrets.SURGE_TOKEN }}
+          # mkdocs build is in public/ 
+          npx surge --project public --domain ${{ steps.vars.outputs.deploy_domain }} --token ${{ secrets.SURGE_TOKEN }}
       - name: Update status Comment
         uses: actions-cool/maintain-one-comment@4b2dbf086015f892dcb5e8c1106f5fccd6c1476b # v3.2.0
         with:
@@ -57,4 +57,4 @@ jobs:
             Deploy PR Preview failed.
             <!-- Sticky Pull Request Comment -->
           body-include: "<!-- Sticky Pull Request Comment -->"
-          number: ${{ steps.vars.outputs.pr_number }}
+          number: ${{ steps.vars.outputs.pr_number }}
@@ -0,0 +1,60 @@
+name: Deploy MkDocs to GitHub Pages
+
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: "pip"
+
+      - name: Set up Ruby (for Asciidoctor CLI)
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.2"
+          bundler-cache: false
+
+      - name: Install Asciidoctor + Rouge
+        run: sudo gem install --no-document asciidoctor rouge
+
+      - name: Install MkDocs Python dependencies
+        run: pip install -r requirements.txt
+
+      - name: Build MkDocs site
+        run: |
+          python -m mkdocs build -f mkdocs.yml
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: public
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deploy.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - id: deploy
+        uses: actions/deploy-pages@v4
@@ -26,3 +26,9 @@ package-lock.json
 package.json
 vale-report*
 workspace.code-workspace
+public/
+
+# Local Netlify folder
+.netlify
+
+.venv
@@ -10,10 +10,12 @@
 # The `htmltest` tool is validating the internal and external links on the HTML build of the documentation.
 # See: https://github.com/wjdp/htmltest
 
-DirectoryPath: build/
+DirectoryPath: public/
 OutputDir: .cache/htmltest
 ExternalTimeout: 60 # (seconds) default is 15.
+IgnoreDirectoryMissingTrailingSlash: true # Turns off errors for links to directories without a trailing slash
 IgnoreURLs:
   - https://cse.google.com/cse.js
   - https://github.com/redhat-documentation/vale-at-red-hat
   - https://marketplace.visualstudio.com
+  - https://fonts.gstatic.com