From f56b0d6d7b9601f591d7c4a74b383b5f3c800d71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jun 2026 09:27:13 +0000 Subject: [PATCH 1/5] Bump image_processing from 1.14.0 to 2.0.1 Bumps [image_processing](https://github.com/janko/image_processing) from 1.14.0 to 2.0.1. - [Changelog](https://github.com/janko/image_processing/blob/master/CHANGELOG.md) - [Commits](https://github.com/janko/image_processing/compare/v1.14.0...v2.0.1) --- updated-dependencies: - dependency-name: image_processing dependency-version: 2.0.1 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b4557315a..781ca344d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,9 +183,6 @@ GEM logger faraday-net_http (3.4.2) net-http (~> 0.5) - ffi (1.17.4-aarch64-linux-gnu) - ffi (1.17.4-arm64-darwin) - ffi (1.17.4-x86_64-linux-gnu) fiber-storage (1.0.1) flipper (1.4.2) concurrent-ruby (< 2) @@ -229,9 +226,7 @@ GEM logger i18n (1.14.8) concurrent-ruby (~> 1.0) - image_processing (1.14.0) - mini_magick (>= 4.9.5, < 6) - ruby-vips (>= 2.0.17, < 3) + image_processing (2.0.1) importmap-rails (2.2.3) actionpack (>= 6.0.0) activesupport (>= 6.0.0) @@ -276,8 +271,6 @@ GEM marcel (1.1.0) matrix (0.4.3) method_source (1.1.0) - mini_magick (5.3.1) - logger mini_mime (1.1.5) minitest (6.0.6) drb (~> 2.0) @@ -504,9 +497,6 @@ GEM ruby-lsp-rspec (0.1.29) ruby-lsp (~> 0.26.0) ruby-progressbar (1.13.0) - ruby-vips (2.2.5) - ffi (~> 1.12) - logger rubyzip (3.0.2) sanitize (7.0.0) crass (~> 1.0.2) From 4d46821e958f4b9d29cf590e6dc2dd73dba85c4f Mon Sep 17 00:00:00 2001 From: Chris Zetter <253059100+zetter-rpf@users.noreply.github.com> Date: Mon, 8 Jun 2026 17:14:26 +0100 Subject: [PATCH 2/5] Add ruby-vips gem This is now a soft dependency of image_processing. I've chosen ruby-vips rather than mini_magick as it's a newer library that is meant to be more efficient and it looks like we've already done the work to set up the vips library in our dockerfile. --- Gemfile | 1 + Gemfile.lock | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Gemfile b/Gemfile index 5378546ed..d1a7616d3 100644 --- a/Gemfile +++ b/Gemfile @@ -44,6 +44,7 @@ gem 'rack_content_type_default', '~> 1.1' gem 'rack-cors' gem 'rails', '~> 8.1.3' gem 'ruby-progressbar', '~> 1.13', require: false +gem 'ruby-vips' gem 'sentry-rails' gem 'statesman' diff --git a/Gemfile.lock b/Gemfile.lock index 781ca344d..0578b4d4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -183,6 +183,9 @@ GEM logger faraday-net_http (3.4.2) net-http (~> 0.5) + ffi (1.17.4-aarch64-linux-gnu) + ffi (1.17.4-arm64-darwin) + ffi (1.17.4-x86_64-linux-gnu) fiber-storage (1.0.1) flipper (1.4.2) concurrent-ruby (< 2) @@ -497,6 +500,9 @@ GEM ruby-lsp-rspec (0.1.29) ruby-lsp (~> 0.26.0) ruby-progressbar (1.13.0) + ruby-vips (2.3.0) + ffi (~> 1.12) + logger rubyzip (3.0.2) sanitize (7.0.0) crass (~> 1.0.2) @@ -625,6 +631,7 @@ DEPENDENCIES ruby-lsp ruby-lsp-rspec (~> 0.1.29) ruby-progressbar (~> 1.13) + ruby-vips selenium-webdriver sentry-rails shoulda-matchers (~> 7.0) From 3fc193f08d2dac76b2a594e04a89d24bb79e858a Mon Sep 17 00:00:00 2001 From: Chris Zetter <253059100+zetter-rpf@users.noreply.github.com> Date: Tue, 9 Jun 2026 08:55:25 +0100 Subject: [PATCH 3/5] Install libvips in CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fecbc223b..75ca887ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,7 @@ jobs: - name: Install test dependencies run: > sudo apt-get update && sudo apt-get install --yes --no-install-recommends - build-essential git libpq-dev pkg-config postgresql-client jq curl imagemagick + build-essential git libpq-dev pkg-config postgresql-client jq curl imagemagick libvips - name: Set up Firefox uses: browser-actions/setup-firefox@v1 From a28c12b914161f9e2ba619589034dcd6f63bc1af Mon Sep 17 00:00:00 2001 From: Chris Zetter <253059100+zetter-rpf@users.noreply.github.com> Date: Tue, 9 Jun 2026 08:59:02 +0100 Subject: [PATCH 4/5] Remove packages not needed Many of the packages here are installed by the default image https://redirect.github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 75ca887ef..6958ba6f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install lint dependencies - run: sudo apt-get update && sudo apt-get install --yes --no-install-recommends build-essential git libpq-dev pkg-config - name: Set up Ruby and bundle cache uses: ruby/setup-ruby@v1 @@ -103,7 +101,7 @@ jobs: - name: Install test dependencies run: > sudo apt-get update && sudo apt-get install --yes --no-install-recommends - build-essential git libpq-dev pkg-config postgresql-client jq curl imagemagick libvips + libvips - name: Set up Firefox uses: browser-actions/setup-firefox@v1 From 26f2cf0c6a92d83e42429b796501e97eaa33a03c Mon Sep 17 00:00:00 2001 From: Chris Zetter <253059100+zetter-rpf@users.noreply.github.com> Date: Tue, 9 Jun 2026 09:01:45 +0100 Subject: [PATCH 5/5] Cache bust gems I want to make sure gems can be rebuilt without the extra dependencies I removed in the previous commit --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6958ba6f6..5247ef919 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,7 @@ jobs: with: ruby-version: .tool-versions bundler-cache: true + cache-version: 1 - name: Run RuboCop run: bundle exec rubocop --format progress @@ -111,6 +112,7 @@ jobs: with: ruby-version: .tool-versions bundler-cache: true + cache-version: 1 - name: Verify Firefox availability run: firefox --version