From 39064fe631568901f04bb4fa43cbeb66f87890f6 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 29 Dec 2021 10:28:53 +0100 Subject: [PATCH] [CI] Remove macOS jobs --- .github/workflows/unit-tests.yml | 20 ++++--------------- .../HttpClient/Tests/HttpClientTestCase.php | 3 --- .../Doctrine/DoctrineIntegrationTest.php | 1 - .../Tests/Dumper/ServerDumperTest.php | 3 --- .../VarDumper/Tests/Server/ConnectionTest.php | 3 --- .../HttpClient/Test/HttpClientTestCase.php | 6 ------ 6 files changed, 4 insertions(+), 32 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index ee8ffee658f5b..712657bd3d3c7 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -20,23 +20,16 @@ jobs: matrix: include: - php: '7.2' - os: ubuntu-20.04 - php: '7.4' - os: ubuntu-20.04 - - php: '8.0' - os: macos-11 - php: '8.0' mode: high-deps - os: ubuntu-20.04 - php: '8.1' mode: low-deps - os: ubuntu-20.04 - php: '8.2' mode: experimental - os: ubuntu-20.04 fail-fast: false - runs-on: "${{ matrix.os }}" + runs-on: ubuntu-20.04 steps: - name: Checkout @@ -58,11 +51,6 @@ jobs: extensions: "${{ env.extensions }}" tools: flex - - name: Install Homebrew packages - if: "matrix.os == 'macos-11'" - run: | - brew install parallel - - name: Configure environment run: | git config --global user.email "" @@ -74,7 +62,7 @@ jobs: ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json" echo COLUMNS=120 >> $GITHUB_ENV - echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data$([[ ${{ matrix.os }} = macos* ]] && echo ',transient-on-macos')" >> $GITHUB_ENV + echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V) @@ -148,7 +136,7 @@ jobs: echo "::endgroup::" - name: Patch return types - if: "matrix.php == '8.1' && ! matrix.mode && matrix.os != 'macos-11'" + if: "matrix.php == '8.1' && ! matrix.mode" run: | sed -i 's/"\*\*\/Tests\/"//' composer.json composer install -q --optimize-autoloader @@ -222,7 +210,7 @@ jobs: [[ ! $X ]] || (exit 1) - name: Run tests with SIGCHLD enabled PHP - if: "matrix.php == '7.2' && ! matrix.mode && matrix.os != 'macos-11'" + if: "matrix.php == '7.2' && ! matrix.mode" run: | mkdir build cd build diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php index e5b86a3be96cc..36e76ee83b9a1 100644 --- a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php +++ b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php @@ -19,9 +19,6 @@ abstract class HttpClientTestCase extends BaseHttpClientTestCase { - /** - * @group transient-on-macos - */ public function testTimeoutOnDestruct() { if (!method_exists(parent::class, 'testTimeoutOnDestruct')) { diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php index 45ca47af4882a..2bc70871baf5c 100644 --- a/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php +++ b/src/Symfony/Component/Messenger/Tests/Transport/Doctrine/DoctrineIntegrationTest.php @@ -21,7 +21,6 @@ /** * @requires extension pdo_sqlite - * @group transient-on-macos */ class DoctrineIntegrationTest extends TestCase { diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/ServerDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/ServerDumperTest.php index ff4727538399c..447d4856f7329 100644 --- a/src/Symfony/Component/VarDumper/Tests/Dumper/ServerDumperTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Dumper/ServerDumperTest.php @@ -37,9 +37,6 @@ public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable() $dumper->dump($data); } - /** - * @group transient-on-macos - */ public function testDump() { $wrappedDumper = $this->createMock(DataDumperInterface::class); diff --git a/src/Symfony/Component/VarDumper/Tests/Server/ConnectionTest.php b/src/Symfony/Component/VarDumper/Tests/Server/ConnectionTest.php index ee89d74d0af3d..70629a221569a 100644 --- a/src/Symfony/Component/VarDumper/Tests/Server/ConnectionTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Server/ConnectionTest.php @@ -22,9 +22,6 @@ class ConnectionTest extends TestCase { private const VAR_DUMPER_SERVER = 'tcp://127.0.0.1:9913'; - /** - * @group transient-on-macos - */ public function testDump() { $cloner = new VarCloner(); diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php index 648c9174e21a5..7ebf055d75701 100644 --- a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php +++ b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php @@ -810,9 +810,6 @@ public function testTimeoutWithActiveConcurrentStream() } } - /** - * @group transient-on-macos - */ public function testTimeoutOnInitialize() { $p1 = TestHttpServer::start(8067); @@ -846,9 +843,6 @@ public function testTimeoutOnInitialize() } } - /** - * @group transient-on-macos - */ public function testTimeoutOnDestruct() { $p1 = TestHttpServer::start(8067);