From 7afaea7c1cd39c827941db7e8af1a65c59d6d30b Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Tue, 14 Nov 2023 13:11:58 +0100
Subject: [PATCH 1/3] Don't run on main branch, enable tests for pull_request

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c7421a..b3fbf77 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,9 +1,9 @@
 name: ci
 
 on:
+  pull_request:
   push:
     branches:
-      - 'main'
       - 'develop'
     tags:
       - '*'
@@ -34,6 +34,7 @@ jobs:
         uses: coverallsapp/github-action@v2
 
   release:
+    if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     needs: test
     env:
@@ -53,6 +54,7 @@ jobs:
         run: task gem:build gem:push
 
   docker:
+    if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main'
     runs-on: ubuntu-latest
     needs: test
     steps:

From ef0b96dadaa10c77e16e29fdba3a1b36787c1891 Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Wed, 12 Jun 2024 10:20:26 +0200
Subject: [PATCH 2/3] Update container base image from ruby:3.1-slim to
 docker.io/library/ruby:3.3-slim, minor adjustments in Taskfile

---
 CHANGELOG.md | 3 ++-
 Dockerfile   | 6 +++---
 Taskfile.yml | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ceac50..1b3eeae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 -
 
 ### Changed
--
+- Update container base image from ruby:3.1-slim to docker.io/library/ruby:3.3-slim
+- Adjust description and alias in Taskfile
 
 ### Fixed
 -
diff --git a/Dockerfile b/Dockerfile
index aaca743..2e4095b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:3.1-slim AS builder
+FROM docker.io/library/ruby:3.3-slim AS builder
 
 RUN apt-get update && apt-get -y install build-essential && rm -rf /var/lib/apt/lists/*
 WORKDIR jekyll-rdf
@@ -8,14 +8,14 @@ ARG VERSION
 RUN gem build jekyll-rdf.gemspec && \
     gem install jekyll-rdf-*.gem mustache
 
-FROM ruby:3.1-slim AS slim
+FROM docker.io/library/ruby:3.3-slim AS slim
 COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
 
 WORKDIR /data
 
 CMD /usr/local/bundle/bin/jekyll build
 
-FROM ruby:3.1-slim
+FROM docker.io/library/ruby:3.3-slim
 COPY --from=builder /jekyll-rdf/docker-resources/ /docker-resources
 COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
 RUN apt-get update && apt-get -y install build-essential git && rm -rf /var/lib/apt/lists/*
diff --git a/Taskfile.yml b/Taskfile.yml
index 198f037..8f43028 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -42,8 +42,9 @@ tasks:
     cmds:
       - gem push {{.GEM_NAME}}-{{.GEM_VERSION}}.gem
 
-  docker:build:
-    desc: The list of all defined tasks
+  image:build:
+    desc: Build the docker image for the current version
+    aliases: [podman:build, docker:build]
     cmds:
       - docker build --no-cache --build-arg VERSION={{.GEM_VERSION}} -t {{.DOCKER_IMAGE}}:{{.GEM_VERSION}} .
 

From 1fdc0454241c54e29eed0d7c7da72b20f17766cf Mon Sep 17 00:00:00 2001
From: Natanael Arndt <arndtn@gmail.com>
Date: Wed, 12 Jun 2024 10:25:20 +0200
Subject: [PATCH 3/3] Prepare Changelog for 4.2.0 release

---
 CHANGELOG.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b3eeae..48d3294 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,12 +10,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 -
 
 ### Changed
-- Update container base image from ruby:3.1-slim to docker.io/library/ruby:3.3-slim
-- Adjust description and alias in Taskfile
+-
 
 ### Fixed
 -
 
+## [4.2.0] - 2024-06-12
+
+### Changed
+- Update container base image from `ruby:3.1-slim` to `docker.io/library/ruby:3.3-slim`
+- Adjust description and alias in Taskfile.yml
+
+### Fixed
+- Fixe the `jekyll-sass-converter` dependency requirement (which is a dependency of `jekyll`) by updating to ruby 3.3
+
 ## [4.1.2] - 2023-11-14
 
 ### Fixed