From af35cb99edbc405049f19d19f4c187a20f005243 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Mon, 21 Sep 2026 21:04:11 +0530 Subject: [PATCH] Fix couchbase support on ubuntu 26.04 [skip ci] --- README.md | 39 +++++++++++++++-------------- src/scripts/extensions/couchbase.sh | 6 ++--- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 656d785a..887365c7 100644 --- a/README.md +++ b/README.md @@ -68,21 +68,23 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t ### GitHub-Hosted Runners -| Virtual environment | Arch | YAML workflow label | Pre-installed PHP | -|---------------------|---------|------------------------------------|-------------------| -| Ubuntu 26.04 | x86_64 | `ubuntu-26.04` | `PHP 8.5` | -| Ubuntu 24.04 | x86_64 | `ubuntu-latest` or `ubuntu-24.04` | `PHP 8.3` | -| Ubuntu 22.04 | x86_64 | `ubuntu-22.04` | `PHP 8.1` | -| Ubuntu 26.04 | aarch64 | `ubuntu-26.04-arm` | `PHP 8.5` | -| Ubuntu 24.04 | aarch64 | `ubuntu-24.04-arm` | `PHP 8.3` | -| Ubuntu 22.04 | aarch64 | `ubuntu-22.04-arm` | `PHP 8.1` | -| Windows Server 2025 | x64 | `windows-2025` | `PHP 8.5` | -| Windows Server 2022 | x64 | `windows-latest` or `windows-2022` | `PHP 8.5` | -| macOS Tahoe 26.x | arm64 | `macos-26` | - | -| macOS Sequoia 15.x | arm64 | `macos-latest` or `macos-15` | - | -| macOS Sonoma 14.x | arm64 | `macos-14` | - | -| macOS Tahoe 26.x | x86_64 | `macos-26-intel` | `PHP 8.5` | -| macOS Sequoia 15.x | x86_64 | `macos-15-intel` | `PHP 8.5` | +| Virtual environment | Arch | YAML workflow label | Pre-installed PHP | +|------------------------|---------|-----------------------------------------------------------|-------------------| +| Ubuntu 26.04 | x86_64 | `ubuntu-26.04` | `PHP 8.5` | +| Ubuntu 24.04 | x86_64 | `ubuntu-latest` or `ubuntu-24.04` | `PHP 8.3` | +| Ubuntu 22.04 | x86_64 | `ubuntu-22.04` | `PHP 8.1` | +| Ubuntu 26.04 | aarch64 | `ubuntu-26.04-arm` | `PHP 8.5` | +| Ubuntu 24.04 | aarch64 | `ubuntu-24.04-arm` | `PHP 8.3` | +| Ubuntu 22.04 | aarch64 | `ubuntu-22.04-arm` | `PHP 8.1` | +| Windows Server 2025 | x64 | `windows-latest`, `windows-2025` or `windows-2025-vs2026` | `PHP 8.5` | +| Windows Server 2022 | x64 | `windows-2022` | `PHP 8.5` | +| Windows 11 ARM | arm64 | `windows-11-arm` or `windows-11-vs2026-arm` | `PHP 8.4` | +| macOS Golden Gate 27.x | arm64 | `xcode-27` | - | +| macOS Tahoe 26.x | arm64 | `macos-latest` or `macos-26` | - | +| macOS Sequoia 15.x | arm64 | `macos-15` | - | +| macOS Sonoma 14.x | arm64 | `macos-14` | - | +| macOS Tahoe 26.x | x86_64 | `macos-26-intel` | `PHP 8.5` | +| macOS Sequoia 15.x | x86_64 | `macos-15-intel` | `PHP 8.5` | > [!NOTE] > Support for Intel (`x86_64`) macOS runners and macOS Sonoma 14.x (`macos-14`) arm64 runners is deprecated and will be removed completely in a future release of `setup-php`. We recommend migrating to arm64-based macOS runners running macOS 15 or newer, such as `macos-26` or `macos-15`. @@ -96,12 +98,11 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t | Ubuntu 22.04 | `self-hosted` or `Linux` | | Debian 13 | `self-hosted` or `Linux` | | Debian 12 | `self-hosted` or `Linux` | -| Debian 11 | `self-hosted` or `Linux` | | Windows 7 and newer | `self-hosted` or `Windows` | | Windows Server 2012 R2 and newer | `self-hosted` or `Windows` | -| macOS Tahoe 26.x x86_64/arm64 | `self-hosted` or `macOS` | -| macOS Sequoia 15.x x86_64/arm64 | `self-hosted` or `macOS` | -| macOS Sonoma 14.x x86_64/arm64 | `self-hosted` or `macOS` | +| macOS Golden Gate 27.x arm64 | `self-hosted` or `macOS` | +| macOS Tahoe 26.x arm64 | `self-hosted` or `macOS` | +| macOS Sequoia 15.x arm64 | `self-hosted` or `macOS` | - Refer to the [self-hosted setup](#self-hosted-setup) to use the action on self-hosted runners. - Operating systems based on the above Ubuntu and Debian versions are also supported on a best effort basis. diff --git a/src/scripts/extensions/couchbase.sh b/src/scripts/extensions/couchbase.sh index ef4b8762..9a827a44 100644 --- a/src/scripts/extensions/couchbase.sh +++ b/src/scripts/extensions/couchbase.sh @@ -7,7 +7,7 @@ add_couchbase_clibs() { else release=$(get -s -n "" "$trunk"/latest | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+" | head -n 1) fi - [ "$VERSION_ID" = "24.04" ] && vid=22.04 || vid="$VERSION_ID" + [[ "$VERSION_ID" = "24.04" || "$VERSION_ID" = "26.04" ]] && vid=22.04 || vid="$VERSION_ID" [ "$VERSION_CODENAME" = "noble" ] && vcn=jammy || vcn="$VERSION_CODENAME" deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${vid/./}_${vcn}_amd64.tar" get -q -n /tmp/libcouchbase.tar "$deb_url" @@ -22,9 +22,9 @@ add_couchbase_clibs() { } add_old_libssl() { - if [[ "$VERSION_ID" = "24.04" ]]; then + if [[ "$VERSION_ID" = "24.04" || "$VERSION_ID" = "26.04" ]]; then get -q -n /tmp/libssl.deb http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb - [ -e /tmp/libssl.deb ] && sudo dpkg -i /tmp/libssl.deb || add_extension_log "couchbase" "Could not install libssl1.1" + ([ -e /tmp/libssl.deb ] && sudo dpkg -i /tmp/libssl.deb) || add_extension_log "couchbase" "Could not install libssl1.1" fi }