From 1474d67903bffba5001889fded28898a8edc9f7a Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Mon, 3 Apr 2023 10:11:53 +0530 Subject: [PATCH] Drop support for ubuntu-18.04 --- .github/workflows/docs.yml | 4 ++-- .github/workflows/php.yml | 2 +- README.md | 5 ----- src/scripts/extensions/couchbase.sh | 6 ------ 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 11f7a47df..242cef492 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - operating-system: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-2022, macos-11] + operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2022, macos-11] php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] steps: - name: Setup PHP @@ -70,7 +70,7 @@ jobs: git config --local user.name "${{ github.repository_owner }}" - name: Combine run: | - for os in ubuntu-22.04 ubuntu-20.04 ubuntu-18.04 windows-2022 windows-2019 macos-11 macos-10.15; do + for os in ubuntu-22.04 ubuntu-20.04 windows-2022 windows-2019 macos-11 macos-10.15; do echo "These are extensions which are loaded by default on the following PHP versions. More extensions which are available as packages and available on pecl are supported by setup-php. Refer to [php extension support](https://github.com/shivammathur/setup-php#heavy_plus_sign-php-extension-support) for more details." > Php-extensions-loaded-on-"$os".md for version in 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2; do if [ "$os" = "macos-10.15" ]; then diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index a54ba3fc1..c3e96058f 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -28,7 +28,7 @@ jobs: strategy: fail-fast: false matrix: - operating-system: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-2019, macos-latest] + operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2019, macos-latest] php-versions: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3'] include: - operating-system: ubuntu-22.04 diff --git a/README.md b/README.md index 8f1b90488..fae504fad 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,6 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t |---------------------|------------------------------------|------------------------| | Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | `PHP 8.1` | | Ubuntu 20.04 | `ubuntu-20.04` | `PHP 7.4` to `PHP 8.2` | -| Ubuntu 18.04 | `ubuntu-18.04` | `PHP 7.2` to `PHP 8.2` | | Windows Server 2022 | `windows-latest` or `windows-2022` | `PHP 8.2` | | Windows Server 2019 | `windows-2019` | `PHP 8.2` | | macOS Monterey 12.x | `macos-12` | `PHP 8.2` | @@ -87,7 +86,6 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t |----------------------------------|----------------------------| | Ubuntu 22.04 | `self-hosted` or `Linux` | | Ubuntu 20.04 | `self-hosted` or `Linux` | -| Ubuntu 18.04 | `self-hosted` or `Linux` | | Debian 11 | `self-hosted` or `Linux` | | Debian 10 | `self-hosted` or `Linux` | | Windows 7 and newer | `self-hosted` or `Windows` | @@ -707,9 +705,6 @@ act -P ubuntu-22.04=shivammathur/node:2204 # For runs-on: ubuntu-20.04 act -P ubuntu-20.04=shivammathur/node:2004 - -# For runs-on: ubuntu-18.04 -act -P ubuntu-18.04=shivammathur/node:1804 ``` ### JIT Configuration diff --git a/src/scripts/extensions/couchbase.sh b/src/scripts/extensions/couchbase.sh index 2427b7096..262a854c8 100644 --- a/src/scripts/extensions/couchbase.sh +++ b/src/scripts/extensions/couchbase.sh @@ -17,12 +17,6 @@ add_couchbase_clibs() { } add_couchbase_cxxlibs() { - if [ "$VERSION_ID" = "18.04" ]; then - if ! command -v gcc-8 >/dev/null || ! command -v g++-8 >/dev/null; then - install_packages gcc-8 g++-8 -y - fi - printf "gcc g++" | xargs -d ' ' -I {} sudo update-alternatives --install /usr/bin/{} {} /usr/bin/{}-8 8 - fi if [ "${runner:?}" = "self-hosted" ]; then add_list cmake https://apt.kitware.com/ubuntu/ https://apt.kitware.com/keys/kitware-archive-latest.asc "$VERSION_CODENAME" main fi