Skip to content

Commit 1474d67

Browse files
committed
Drop support for ubuntu-18.04
1 parent 1afae18 commit 1474d67

File tree

4 files changed

+3
-14
lines changed

4 files changed

+3
-14
lines changed

.github/workflows/docs.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
operating-system: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-2022, macos-11]
18+
operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2022, macos-11]
1919
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']
2020
steps:
2121
- name: Setup PHP
@@ -70,7 +70,7 @@ jobs:
7070
git config --local user.name "${{ github.repository_owner }}"
7171
- name: Combine
7272
run: |
73-
for os in ubuntu-22.04 ubuntu-20.04 ubuntu-18.04 windows-2022 windows-2019 macos-11 macos-10.15; do
73+
for os in ubuntu-22.04 ubuntu-20.04 windows-2022 windows-2019 macos-11 macos-10.15; do
7474
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
7575
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
7676
if [ "$os" = "macos-10.15" ]; then

.github/workflows/php.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
operating-system: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-2019, macos-latest]
31+
operating-system: [ubuntu-22.04, ubuntu-20.04, windows-2019, macos-latest]
3232
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']
3333
include:
3434
- operating-system: ubuntu-22.04

README.md

-5
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
7575
|---------------------|------------------------------------|------------------------|
7676
| Ubuntu 22.04 | `ubuntu-latest` or `ubuntu-22.04` | `PHP 8.1` |
7777
| Ubuntu 20.04 | `ubuntu-20.04` | `PHP 7.4` to `PHP 8.2` |
78-
| Ubuntu 18.04 | `ubuntu-18.04` | `PHP 7.2` to `PHP 8.2` |
7978
| Windows Server 2022 | `windows-latest` or `windows-2022` | `PHP 8.2` |
8079
| Windows Server 2019 | `windows-2019` | `PHP 8.2` |
8180
| 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
8786
|----------------------------------|----------------------------|
8887
| Ubuntu 22.04 | `self-hosted` or `Linux` |
8988
| Ubuntu 20.04 | `self-hosted` or `Linux` |
90-
| Ubuntu 18.04 | `self-hosted` or `Linux` |
9189
| Debian 11 | `self-hosted` or `Linux` |
9290
| Debian 10 | `self-hosted` or `Linux` |
9391
| Windows 7 and newer | `self-hosted` or `Windows` |
@@ -707,9 +705,6 @@ act -P ubuntu-22.04=shivammathur/node:2204
707705
708706
# For runs-on: ubuntu-20.04
709707
act -P ubuntu-20.04=shivammathur/node:2004
710-
711-
# For runs-on: ubuntu-18.04
712-
act -P ubuntu-18.04=shivammathur/node:1804
713708
```
714709

715710
### JIT Configuration

src/scripts/extensions/couchbase.sh

-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ add_couchbase_clibs() {
1717
}
1818

1919
add_couchbase_cxxlibs() {
20-
if [ "$VERSION_ID" = "18.04" ]; then
21-
if ! command -v gcc-8 >/dev/null || ! command -v g++-8 >/dev/null; then
22-
install_packages gcc-8 g++-8 -y
23-
fi
24-
printf "gcc g++" | xargs -d ' ' -I {} sudo update-alternatives --install /usr/bin/{} {} /usr/bin/{}-8 8
25-
fi
2620
if [ "${runner:?}" = "self-hosted" ]; then
2721
add_list cmake https://apt.kitware.com/ubuntu/ https://apt.kitware.com/keys/kitware-archive-latest.asc "$VERSION_CODENAME" main
2822
fi

0 commit comments

Comments
 (0)