From 66c9fdd011033cf485d288fe3e240a17d8e7bac7 Mon Sep 17 00:00:00 2001
From: Jack Greiner <jack@emoss.org>
Date: Mon, 13 May 2024 23:09:30 -0400
Subject: [PATCH] Merge main into upcoming.

---
 .github/workflows/website_check.yml | 4 ++--
 .gitignore                          | 1 +
 README.md                           | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/website_check.yml b/.github/workflows/website_check.yml
index 5b2d989..4954b5e 100644
--- a/.github/workflows/website_check.yml
+++ b/.github/workflows/website_check.yml
@@ -33,12 +33,12 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: naev-website-${{ github.sha }}-crashlog
-        path: ${{ github.workspace }}/*.log
+        path: ./*.log
         if-no-files-found: warn
 
     - name: Upload Website Artifacts
       uses: actions/upload-artifact@v3
       with:
         name: naev-website-${{ github.sha }}
-        path: ${{ github.workspace }}/output/*
+        path: ./output/*
         if-no-files-found: error
diff --git a/.gitignore b/.gitignore
index 9d4592c..e4a24e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+Gemfile.lock
 crash.log
 output/
 tmp/
diff --git a/README.md b/README.md
index b124e46..4a72446 100644
--- a/README.md
+++ b/README.md
@@ -46,4 +46,8 @@ The writing is down using [markdown](https://daringfireball.net/projects/markdow
 
 If you wish to use images you have to separately put them in `content/imgs/blarg/` and you can reference them in the post with the inline ruby code `<%= @items['/imgs/blarg/FILENAME'].path %>` where `FILENAME` is replaced by the name of the file. This expression will be converted to the file path when compiling.
 
-For Blarg posts please try and follow the convention in [`content/content/imgs/blarg`](https://github.com/naev/naev-website/tree/main/content/imgs/blarg) to keep things organized. (`content/content/imgs/blarg/YYYY/MM`)
+For Blarg posts please try and follow the convention in [`content/content/imgs/blarg`](./content/imgs/blarg) to keep things organized. (`content/content/imgs/blarg/YYYY/MM`)
+
+### Maintenance
+
+If you'd like to bump the version of ruby that the site is built with, change the version in [.ruby-version](./.ruby-version) to a supported version of ruby as mentioned on this [documentation page](https://github.com/ruby/setup-ruby?tab=readme-ov-file#supported-version-syntax).