diff --git a/.github/workflows/ci-linux.yaml b/.github/workflows/ci-linux.yaml index 9f9c8b2a7..dc1987773 100644 --- a/.github/workflows/ci-linux.yaml +++ b/.github/workflows/ci-linux.yaml @@ -8,6 +8,10 @@ on: schedule: - cron: '0 0 * * *' +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + env: PHPUNIT_FLAGS: "-v" SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit" @@ -33,7 +37,6 @@ jobs: env: SYMFONY_VERSION: ${{ matrix.symfony-version }} - MAKER_ALLOW_DEV_DEPS_IN_APP: ${{ matrix.allow-dev-deps-in-apps }} strategy: fail-fast: false @@ -41,20 +44,14 @@ jobs: php-version: - '8.3' symfony-version: - - '6.4.x-dev' - - '7.0.x-dev' - - '7.1.x-dev' + - '6.4.*' + - '7.2.*' dependency-versions: ['highest'] - allow-dev-deps-in-apps: ['0'] include: # testing lowest PHP+dependencies with lowest Symfony - php-version: '8.1' symfony-version: '6.4.*' dependency-versions: 'lowest' - # testing lowest PHP+dependencies with highest Symfony - - php-version: '8.1' - symfony-version: '6.4.*' - dependency-versions: 'highest' steps: - name: Checkout code @@ -63,8 +60,9 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - coverage: "none" + coverage: none php-version: ${{ matrix.php-version }} + tools: flex - name: Add PHPUnit matcher run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" diff --git a/.github/workflows/ci-windows.yaml b/.github/workflows/ci-windows.yaml index 44a059f0d..be2e682f6 100644 --- a/.github/workflows/ci-windows.yaml +++ b/.github/workflows/ci-windows.yaml @@ -8,6 +8,10 @@ on: schedule: - cron: '0 0 * * *' +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + env: PHPUNIT_FLAGS: "-v" SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit" @@ -15,8 +19,6 @@ env: MAKER_SKIP_PANTHER_TEST: 1 MAKER_TEST_WINDOWS: 1 MAKER_DISABLE_FILE_LINKS: 1 - MAKER_ALLOW_DEV_DEPS_IN_APP: 0 - SYMFONY_VERSION: '7.0.x-dev' jobs: tests: diff --git a/composer.json b/composer.json index 3b9010d17..c8ead122b 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ } ], "minimum-stability": "dev", + "prefer-stable": true, "require": { "php": ">=8.1", "doctrine/inflector": "^2.0", diff --git a/src/Test/MakerTestEnvironment.php b/src/Test/MakerTestEnvironment.php index b021465ec..f7af580ff 100644 --- a/src/Test/MakerTestEnvironment.php +++ b/src/Test/MakerTestEnvironment.php @@ -259,11 +259,6 @@ private function buildFlexSkeleton(): void $this->composerRequireMakerBundle(\sprintf('%s/%s', $this->cachePath, $flexProjectDir)); } - if ($_SERVER['MAKER_ALLOW_DEV_DEPS_IN_APP'] ?? false) { - MakerTestProcess::create('composer config minimum-stability dev', $this->flexPath)->run(); - MakerTestProcess::create('composer config prefer-stable true', $this->flexPath)->run(); - } - // fetch a few packages needed for testing MakerTestProcess::create('composer require phpunit browser-kit symfony/css-selector --prefer-dist --no-progress --no-suggest', $this->flexPath) ->run();