Merge branch 'develop'

Author: white-gecko

.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:

CHANGELOG.md

@@ -15,6 +15,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### 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

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/*

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}} .