Skip to content

Commit 8671fbf

Browse files
committed
More alignment of GH build workflow with the PluginSkeleton one
1 parent d080705 commit 8671fbf

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/build.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,12 @@ jobs:
9494
restore-keys: |
9595
${{ runner.os }}-php-${{ matrix.php }}-composer-
9696
97-
-
98-
name: Configure global composer
99-
run: |
100-
composer global config --no-plugins allow-plugins.symfony/flex true
101-
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^2.2.2"
102-
10397
-
10498
name: Restrict Symfony version
10599
if: matrix.symfony != ''
106100
run: |
101+
composer global config --no-plugins allow-plugins.symfony/flex true
102+
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^2.4"
107103
composer config extra.symfony.require "${{ matrix.symfony }}"
108104
109105
-
@@ -113,9 +109,7 @@ jobs:
113109

114110
-
115111
name: Install PHP dependencies
116-
run: composer install --no-interaction --no-plugins
117-
env:
118-
SYMFONY_REQUIRE: ${{ matrix.symfony }}
112+
run: composer install --no-interaction
119113

120114
-
121115
name: Get Yarn cache directory
@@ -157,8 +151,12 @@ jobs:
157151
run: (cd tests/Application && bin/console sylius:fixtures:load -n)
158152

159153
-
160-
name: Validate database schema
161-
run: (cd tests/Application && bin/console doctrine:schema:validate)
154+
name: Validate composer.json
155+
run: composer validate --ansi --strict
156+
157+
-
158+
name: Validate container
159+
run: (cd tests/Application && bin/console lint:container)
162160

163161
-
164162
name: Run ECS

composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
"friends-of-behat/symfony-extension": "^2.6",
3232
"friends-of-behat/variadic-extension": "^1.6",
3333
"league/csv": "^9.8",
34-
"matthiasnoback/symfony-dependency-injection-test": "^4.3",
3534
"mikey179/vfsstream": "^1.6",
3635
"nyholm/psr7": "^1.8",
3736
"phpspec/phpspec": "^7.5",
@@ -66,6 +65,9 @@
6665
"extra": {
6766
"branch-alias": {
6867
"dev-master": "2.0-dev"
68+
},
69+
"symfony": {
70+
"require": "^6.4"
6971
}
7072
},
7173
"autoload": {

0 commit comments

Comments
 (0)