8000 Tighten up CI matrix · symfony/maker-bundle@1aed5cb · GitHub
[go: up one dir, main page]
Skip to content

Commit 1aed5cb

Browse files
kbondkbond
committed
Tighten up CI matrix
1 parent 2140aff commit 1aed5cb

File tree

4 files changed

+13
-17
lines changed

4 files changed

+13
-17
lines changed

‎.github/workflows/ci-linux.yaml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
schedule:
99
- cron: '0 0 * * *'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
1115
env:
1216
PHPUNIT_FLAGS: "-v"
1317
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
@@ -33,28 +37,21 @@ jobs:
3337

3438
env:
3539
SYMFONY_VERSION: ${{ matrix.symfony-version }}
36-
MAKER_ALLOW_DEV_DEPS_IN_APP: ${{ matrix.allow-dev-deps-in-apps }}
3740

3841
strategy:
3942
fail-fast: false
4043
matrix:
4144
php-version:
4245
- '8.3'
4346
symfony-version:
44-
- '6.4.x-dev'
45-
- '7.0.x-dev'
46-
- '7.1.x-dev'
47+
- '6.4.*'
48+
- '7.2.*'
4749
dependency-versions: ['highest']
48-
allow-dev-deps-in-apps: ['0']
4950
include:
5051
# testing lowest PHP+dependencies with lowest Symfony
5152
- php-version: '8.1'
5253
symfony-version: '6.4.*'
5354
dependency-versions: 'lowest'
54-
# testing lowest PHP+dependencies with highest Symfony
55-
- php-version: '8.1'
56-
symfony-version: '6.4.*'
57-
dependency-versions: 'highest'
5855

5956
steps:
6057
- name: Checkout code
@@ -63,8 +60,9 @@ jobs:
6360
- name: Install PHP with extensions
6461
uses: shivammathur/setup-php@v2
6562
with:
66-
coverage: "none"
63+
coverage: none
6764
php-version: ${{ matrix.php-version }}
65+
tools: flex
6866

6967
- name: Add PHPUnit matcher
7068
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

‎.github/workflows/ci-windows.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ on:
88
schedule:
99
- cron: '0 0 * * *'
1010

11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
13+
cancel-in-progress: true
14+
1115
env:
1216
PHPUNIT_FLAGS: "-v"
1317
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
1418
MAKER_SKIP_MERCURE_TEST: 1
1519
MAKER_SKIP_PANTHER_TEST: 1
1620
MAKER_TEST_WINDOWS: 1
1721
MAKER_DISABLE_FILE_LINKS: 1
18-
MAKER_ALLOW_DEV_DEPS_IN_APP: 0
19-
SYMFONY_VERSION: '7.0.x-dev'
2022

2123
jobs:
2224
tests:

‎composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
}
1313
],
1414
"minimum-stability": "dev",
15+
"prefer-stable": true,
1516
"require": {
1617
"php": ">=8.1",
1718
"doctrine/inflector": "^2.0",

‎src/Test/MakerTestEnvironment.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,6 @@ private function buildFlexSkeleton(): void
259259
$this->composerRequireMakerBundle(\sprintf('%s/%s', $this->cachePath, $flexProjectDir));
260260
}
261261

262-
if ($_SERVER['MAKER_ALLOW_DEV_DEPS_IN_APP'] ?? false) {
263-
MakerTestProcess::create('composer config minimum-stability dev', $this->flexPath)->run();
264-
MakerTestProcess::create('composer config prefer-stable true', $this->flexPath)->run();
265-
}
266-
267262
// fetch a few packages needed for testing
268263
MakerTestProcess::create('composer require phpunit browser-kit symfony/css-selector --prefer-dist --no-progress --no-suggest', $this->flexPath)
269264
->run();

0 commit comments

Comments
 (0)
0