Merge pull request #1 from yusi1/master

Fix Github Actions and change baseurl to /xlibre

.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

website/_config.yml

@@ -23,7 +23,7 @@ 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
 

website/_data/navigation.yml

@@ -1,16 +1,16 @@
 - name: Home
   page: /
-  link: /x11libre-website/
+  link: /xlibre/
-  link: /x11libre-website/index.html
+  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