From c3d9ea6736445f89753f154338ac738802766a7d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 27 Jul 2026 10:28:26 +0000 Subject: [PATCH 1/2] Initial plan From fde6acb69b037764a87921b6bad1c4a488641d29 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 27 Jul 2026 10:31:01 +0000 Subject: [PATCH 2/2] fix(php): use Ondrej PPA with noble suite for Ubuntu resolute --- features/src/php/devcontainer-feature.json | 2 +- features/src/php/install.sh | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/features/src/php/devcontainer-feature.json b/features/src/php/devcontainer-feature.json index fb7bfb52..c0d10bb4 100644 --- a/features/src/php/devcontainer-feature.json +++ b/features/src/php/devcontainer-feature.json @@ -2,7 +2,7 @@ "id": "php", "name": "PHP", "description": "Installs PHP into the Dev Environment", - "version": "2.10.1", + "version": "2.10.2", "documentationURL": "https://github.com/Automattic/vip-codespaces/tree/trunk/features/src/php", "options": { "version": { diff --git a/features/src/php/install.sh b/features/src/php/install.sh index cb108c11..61d6abb6 100755 --- a/features/src/php/install.sh +++ b/features/src/php/install.sh @@ -523,15 +523,14 @@ case "${ID_LIKE}" in ;; "ubuntu") - if [ "${CODENAME}" != "resolute" ]; then - echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu ${CODENAME} main" > /etc/apt/sources.list.d/php.list - curl -sSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x71DAEAAB4AD4CAB6" | gpg --dearmor > /etc/apt/trusted.gpg.d/ppa-ondrej-php.gpg + # resolute does not yet have a dedicated PPA suite; noble is the last known-compatible suite + if [ "${CODENAME}" = "resolute" ]; then + PPA_SUITE="noble" else - curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb - dpkg -i /tmp/debsuryorg-archive-keyring.deb - rm -f /tmp/debsuryorg-archive-keyring.deb - echo "deb [signed-by=/usr/share/keyrings/debsuryorg-archive-keyring.gpg] https://packages.sury.org/php/ ${CODENAME} main" > /etc/apt/sources.list.d/php.list + PPA_SUITE="${CODENAME}" fi + echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu ${PPA_SUITE} main" > /etc/apt/sources.list.d/php.list + curl -sSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x71DAEAAB4AD4CAB6" | gpg --dearmor > /etc/apt/trusted.gpg.d/ppa-ondrej-php.gpg ;; *)