From 1d97d396cdda9f46ff138351bb1b8f81beefff81 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 15 Jun 2024 21:25:25 -0500
Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20=20Update=20site=20publishing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/jekyll-pub.yml | 55 +++++++++++++++++++++++++-------
 _config.yml                      |  2 +-
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/jekyll-pub.yml b/.github/workflows/jekyll-pub.yml
index 89bca1d38..12f38e5db 100644
--- a/.github/workflows/jekyll-pub.yml
+++ b/.github/workflows/jekyll-pub.yml
@@ -11,20 +11,53 @@ on:
     branches:
     - master
 
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
 jobs:
-  deploy-site:
+  # Build job
+  build:
     if: github.repository == 'MarlinFirmware/MarlinDocumentation'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/cache@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
         with:
-          path: vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
+          ruby-version: '3.1' # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          cache-version: 0 # Increment this number if you need to re-download cached gems
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: production
+      - name: Upload artifact
+        # Automatically uploads an artifact from the './_site' directory by default
+        uses: actions/upload-pages-artifact@v3
 
-      - uses: helaili/jekyll-action@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+  # Deployment job
+  deploy:
+    if: github.repository == 'MarlinFirmware/MarlinDocumentation'
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/_config.yml b/_config.yml
index 9cf3b8c9c..d877efc0d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -13,7 +13,7 @@ enforce_ssl: marlinfw.org
 version: '1.0.0'
 environment: development
 
-destination: ./build
+destination: ./_site
 
 twitter:
   username: MarlinFirmware