From 0f2edc9486c97b6aef466c077f0f2a4ba9439d0e Mon Sep 17 00:00:00 2001 From: Ben Word Date: Tue, 21 Apr 2026 21:23:15 -0500 Subject: [PATCH 1/2] Ubuntu 26.04 --- .github/workflows/ci.yml | 2 +- .github/workflows/integration.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e39fb27e..9af8bd37a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ on: jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 strategy: matrix: python-version: ['3.14'] diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 142a7c8c5..2badebde5 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -11,7 +11,7 @@ on: jobs: test: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 steps: - run: mkdir $HOME/.ssh - name: Remove and cleanup mysql From 9cb7e87e2833d07bf32e5c2b2f5a50084a75647d Mon Sep 17 00:00:00 2001 From: Ben Word Date: Tue, 3 Nov 2026 10:15:22 -0500 Subject: [PATCH 2/2] Only edit ImageMagick 6 policy.xml when it exists Ubuntu 26.04 ships ImageMagick 7, so /etc/ImageMagick-6/policy.xml doesn't exist and the task failed. ImageMagick 7's default policy doesn't block PDFs, so there's nothing to change there. Co-Authored-By: Claude Opus 5.5 --- roles/php/tasks/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/php/tasks/main.yml b/roles/php/tasks/main.yml index 46a755e00..8b313c392 100644 --- a/roles/php/tasks/main.yml +++ b/roles/php/tasks/main.yml @@ -128,10 +128,17 @@ mode: '0644' notify: reload php-fpm +- name: Check for ImageMagick 6 policy.xml + stat: + path: /etc/ImageMagick-6/policy.xml + register: imagemagick6_policy + +# ImageMagick 7 (Ubuntu 26.04, Debian 13) doesn't block PDFs by default - name: Change ImageMagick policy.xml to allow for PDFs replace: path: /etc/ImageMagick-6/policy.xml regexp: '' replace: '' backup: no + when: imagemagick6_policy.stat.exists notify: reload php-fpm