Skip to content

Commit a8cf6ac

Browse files
committed
Update test suite to future-proof base images
1 parent 81e1b4d commit a8cf6ac

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

.github/workflows/ci.yml

+11-10
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
strategy:
1212
matrix:
1313
os:
14-
- ubuntu-20.04
15-
- windows-2019
14+
- ubuntu-22.04
15+
- windows-2022
1616
php:
1717
- 8.2
1818
- 8.1
@@ -27,7 +27,7 @@ jobs:
2727
- 5.4
2828
- 5.3
2929
steps:
30-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v3
3131
- uses: shivammathur/setup-php@v2
3232
with:
3333
php-version: ${{ matrix.php }}
@@ -53,13 +53,14 @@ jobs:
5353

5454
PHPUnit-hhvm:
5555
name: PHPUnit (HHVM)
56-
runs-on: ubuntu-18.04
56+
runs-on: ubuntu-22.04
5757
continue-on-error: true
5858
steps:
59-
- uses: actions/checkout@v2
60-
- uses: azjezz/setup-hhvm@v1
59+
- uses: actions/checkout@v3
60+
- run: curl -O https://getcomposer.org/download/latest-2.2.x/composer.phar
61+
- uses: docker://hhvm/hhvm:3.30-lts-latest
62+
with:
63+
args: hhvm composer.phar install
64+
- uses: docker://hhvm/hhvm:3.30-lts-latest
6165
with:
62-
version: lts-3.30
63-
- run: composer self-update --2.2 # downgrade Composer for HHVM
64-
- run: hhvm $(which composer) install
65-
- run: hhvm vendor/bin/phpunit
66+
args: hhvm vendor/bin/phpunit

tests/TcpConnectorTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function connectionToTcpServerShouldFailIfFileDescriptorsAreExceeded()
109109
}
110110

111111
// each file descriptor takes ~600 bytes of memory, so skip test if this would exceed memory_limit
112-
if ($ulimit * 600 > $memory) {
112+
if ($ulimit * 600 > $memory || $ulimit > 100000) {
113113
$this->markTestSkipped('Test requires ~' . round($ulimit * 600 / 1024 / 1024) . '/' . round($memory / 1024 / 1024) . ' MiB memory with ' . $ulimit . ' file descriptors');
114114
}
115115

0 commit comments

Comments
 (0)