From 25b15995e76001ed81049fdb3f1e1178e2e350ef Mon Sep 17 00:00:00 2001
From: Yusef Aslam <YUZi54780@outlook.com>
Date: Fri, 4 Jul 2025 10:37:21 +0100
Subject: [PATCH 1/4] .github: jekyll.yml: edit workflow to build and deploy
 from subdirectory

---
 .github/workflows/jekyll.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
index 062315869..af5448869 100644
--- a/.github/workflows/jekyll.yml
+++ b/.github/workflows/jekyll.yml
@@ -43,19 +43,26 @@ jobs:
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v5
+      - name: Setup Jekyll
+        run: bundle install
+        working-directory: ./website
       - name: Build with Jekyll
         # Outputs to the './_site' directory by default
-        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        run: bundle exec jekyll build --baseurl "/website"
+        working-directory: ./website
         env:
           JEKYLL_ENV: production
       - name: Upload artifact
         # Automatically uploads an artifact from the './_site' directory by default
         uses: actions/upload-pages-artifact@v3
+        with:
+          name: github-pages
+          path: "./website/_site"
 
   # Deployment job
   deploy:
     environment:
-      name: github-pages
+      name: xlibre_website
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     needs: build

From 2021f04fda52900319155e69f2efc55214e6a6af Mon Sep 17 00:00:00 2001
From: Yusef Aslam <YUZi54780@outlook.com>
Date: Fri, 4 Jul 2025 10:38:06 +0100
Subject: [PATCH 2/4] website: _config.yml: change baseurl

---
 website/_config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/_config.yml b/website/_config.yml
index 2f82186c1..288bf2c47 100644
--- a/website/_config.yml
+++ b/website/_config.yml
@@ -26,6 +26,7 @@ description: >- # this means to ignore newlines until "baseurl:"
 baseurl: "/xlibre/website" # the subpath of your site, e.g. /blog
 url: "https://xgui4.github.io" # the base hostname & protocol for your site, e.g. http://example.com
 github_username: xgui4
+baseurl: "/xlibre" # the subpath of your site, e.g. /blog
 
 # Build settings
 #plugins:

From d289626aff93f68ed05d0110617fa0698445a959 Mon Sep 17 00:00:00 2001
From: Yusef Aslam <YUZi54780@outlook.com>
Date: Fri, 4 Jul 2025 10:38:15 +0100
Subject: [PATCH 3/4] website: _data: navigation.yml: modify links to match
 baseurl

---
 website/_data/navigation.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/website/_data/navigation.yml b/website/_data/navigation.yml
index 88d54ab6f..1d0698878 100644
--- a/website/_data/navigation.yml
+++ b/website/_data/navigation.yml
@@ -1,16 +1,16 @@
 - name: Home
   page: /
-  link: /x11libre-website/
-  link: /x11libre-website/index.html
+  link: /xlibre/
+  link: /xlibre/index.html
 - name: About
   page: /about.html
-  link: /x11libre-website/about.html
+  link: /xlibre/about.html
 - name: Download
   page: /download.html
-  link: /x11libre-website/download.html
+  link: /xlibre/download.html
 - name: FAQ & Privacy
   page: /faq.html
-  link: /x11libre-website/faq.html
+  link: /xlibre/faq.html
 - name: Wiki
   page: /wiki.html
-  link: /x11libre-website/wiki.html
+  link: /xlibre/wiki.html

From 03cecec7e7288472ea46900713d0a286a2adeda4 Mon Sep 17 00:00:00 2001
From: Yusef Aslam <YUZi54780@outlook.com>
Date: Fri, 4 Jul 2025 10:40:27 +0100
Subject: [PATCH 4/4] website: _config.yml: change baseurl

---
 website/_config.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/website/_config.yml b/website/_config.yml
index 288bf2c47..d08c0ffa5 100644
--- a/website/_config.yml
+++ b/website/_config.yml
@@ -23,10 +23,9 @@ title: X11Libre
 description: >- # this means to ignore newlines until "baseurl:"
   This is the website for the X11Libre project which is an open-source initiative
   focused on providing a modern, libre implementation of the X11 protocol and related tools.
-baseurl: "/xlibre/website" # the subpath of your site, e.g. /blog
+baseurl: "/xlibre" # the subpath of your site, e.g. /blog
 url: "https://xgui4.github.io" # the base hostname & protocol for your site, e.g. http://example.com
 github_username: xgui4
-baseurl: "/xlibre" # the subpath of your site, e.g. /blog
 
 # Build settings
 #plugins: