minor #44836 [CI] Remove macOS jobs (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit c3eece2873f3 · 2021-12-29T11:04:57.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [CI] Remove macOS jobs | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | Fix #38620 | License | MIT | Doc PR | - The CI on macOS is super transient. When we enabled it, it didn't allow spotting any issues. Which means that to me it doesn't cover anything we should care about. Commits ------- 39064fe [CI] Remove macOS jobs
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@`
`19`	`19`
`20`	`20`	`abstract class HttpClientTestCase extends BaseHttpClientTestCase`
`21`	`21`	`{`
`22`		`- /**`
`23`		`- * @group transient-on-macos`
`24`		`- */`
`25`	`22`	`public function testTimeoutOnDestruct()`
`26`	`23`	`{`
`27`	`24`	`if (!method_exists(parent::class, 'testTimeoutOnDestruct')) {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* @requires extension pdo_sqlite`
`24`		`- * @group transient-on-macos`
`25`	`24`	`*/`
`26`	`25`	`class DoctrineIntegrationTest extends TestCase`
`27`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,6 @@ public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable()`
`37`	`37`	`$dumper->dump($data);`
`38`	`38`	`}`
`39`	`39`
`40`		`- /**`
`41`		`- * @group transient-on-macos`
`42`		`- */`
`43`	`40`	`public function testDump()`
`44`	`41`	`{`
`45`	`42`	`$wrappedDumper = $this->createMock(DataDumperInterface::class);`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,6 @@ class ConnectionTest extends TestCase`
`22`	`22`	`{`
`23`	`23`	`private const VAR_DUMPER_SERVER = 'tcp://127.0.0.1:9913';`
`24`	`24`
`25`		`- /**`
`26`		`- * @group transient-on-macos`
`27`		`- */`
`28`	`25`	`public function testDump()`
`29`	`26`	`{`
`30`	`27`	`$cloner = new VarCloner();`
Original file line number	Diff line number	Diff line change
`@@ -810,9 +810,6 @@ public function testTimeoutWithActiveConcurrentStream()`
`810`	`810`	`}`
`811`	`811`	`}`
`812`	`812`
`813`		`- /**`
`814`		`- * @group transient-on-macos`
`815`		`- */`
`816`	`813`	`public function testTimeoutOnInitialize()`
`817`	`814`	`{`
`818`	`815`	`$p1 = TestHttpServer::start(8067);`
`@@ -846,9 +843,6 @@ public function testTimeoutOnInitialize()`
`846`	`843`	`}`
`847`	`844`	`}`
`848`	`845`
`849`		`- /**`
`850`		`- * @group transient-on-macos`
`851`		`- */`
`852`	`846`	`public function testTimeoutOnDestruct()`
`853`	`847`	`{`
`854`	`848`	`$p1 = TestHttpServer::start(8067);`