From 8f89171841d29d0fcacc070f08990a7d6e083ba6 Mon Sep 17 00:00:00 2001 From: Brian Foley Date: Wed, 21 Oct 2026 00:20:25 +0100 Subject: [PATCH] CI: Run PHP 8.5 CI jobs on Ubuntu 26.04 ARM instead of 24.04 x86/64 This gets us coverage of a different CPU architecture (unlikey to matter), and of the latest Ubuntu LTS (with MySQL 8.4 vs MySQL 8.0) --- .github/actions/setup-mysql-db/action.yml | 4 +++- .github/workflows/ci.yml | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup-mysql-db/action.yml b/.github/actions/setup-mysql-db/action.yml index 05c6e56cf3..cdd5069ccc 100644 --- a/.github/actions/setup-mysql-db/action.yml +++ b/.github/actions/setup-mysql-db/action.yml @@ -3,7 +3,9 @@ runs: steps: - name: Start mysql service shell: bash - run: sudo /etc/init.d/mysql start + run: | + sudo systemctl start mysql.service + timeout 30s bash -c 'until mysqladmin ping --silent; do sleep 1; done' - name: Configure mysql shell: bash run: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb7a8bafec..c15259d8f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: cfg: - { os: 'ubuntu-24.04', php: '8.3' } - { os: 'ubuntu-24.04', php: '8.4' } - - { os: 'ubuntu-24.04', php: '8.5' } + - { os: 'ubuntu-26.04-arm', php: '8.5' } runs-on: ${{ matrix.cfg.os }} steps: - name: Checkout Code @@ -41,7 +41,7 @@ jobs: cfg: - { os: 'ubuntu-24.04', php: '8.3' } - { os: 'ubuntu-24.04', php: '8.4' } - - { os: 'ubuntu-24.04', php: '8.5' } + - { os: 'ubuntu-26.04-arm', php: '8.5' } runs-on: ${{ matrix.cfg.os }} steps: - name: Checkout Code @@ -110,7 +110,7 @@ jobs: cfg: - { os: 'ubuntu-24.04', php: '8.3' } - { os: 'ubuntu-24.04', php: '8.4' } - - { os: 'ubuntu-24.04', php: '8.5' } + - { os: 'ubuntu-26.04-arm', php: '8.5' } runs-on: ${{ matrix.cfg.os }} steps: - name: Checkout Code