Skip to content

[CI] Remove macOS jobs #44836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ""
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@

abstract class HttpClientTestCase extends BaseHttpClientTestCase
{
/**
* @group transient-on-macos
*/
public function testTimeoutOnDestruct()
{
if (!method_exists(parent::class, 'testTimeoutOnDestruct')) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

/**
* @requires extension pdo_sqlite
* @group transient-on-macos
*/
class DoctrineIntegrationTest extends TestCase
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable()
$dumper->dump($data);
}

/**
* @group transient-on-macos
*/
public function testDump()
{
$wrappedDumper = $this->createMock(DataDumperInterface::class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
6 changes: 0 additions & 6 deletions src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -810,9 +810,6 @@ public function testTimeoutWithActiveConcurrentStream()
}
}

/**
* @group transient-on-macos
*/
public function testTimeoutOnInitialize()
{
$p1 = TestHttpServer::start(8067);
Expand Down Expand Up @@ -846,9 +843,6 @@ public function testTimeoutOnInitialize()
}
}

/**
* @group transient-on-macos
*/
public function testTimeoutOnDestruct()
{
$p1 = TestHttpServer::start(8067);
Expand Down