Skip to content

Commit

Permalink
Install the correct version of the symfony packages (#108)
Browse files Browse the repository at this point in the history
  • Loading branch information
micheh authored Dec 5, 2020
1 parent 2aa06e6 commit 6a97204
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
15 changes: 5 additions & 10 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ jobs:
with:
coverage: none
php-version: ${{ matrix.php-version }}
tools: flex

- name: "Determine composer cache directory"
id: determine-composer-cache-directory
Expand All @@ -105,17 +106,11 @@ jobs:
key: php-${{ matrix.php-version }}-composer-${{ matrix.symfony-version }}-${{ hashFiles('composer.json') }}
restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.symfony-version }}-

- name: "Install symfony 3 dependencies from composer.json"
if: matrix.symfony-version == '3'
run: composer require symfony/framework-bundle ^3.0 --prefer-stable --update-with-all-dependencies --no-interaction --no-progress --no-suggest

- name: "Install Symfony 4 dependencies from composer.json"
if: matrix.symfony-version == '4'
run: composer require symfony/framework-bundle ^4.0 --prefer-stable --update-with-all-dependencies --no-interaction --no-progress --no-suggest
- name: "Restrict symfony dependencies to the correct version"
run: composer config extra.symfony.require ${{ matrix.symfony-version }}.*

- name: "Install Symfony 5 dependencies from composer.json"
if: matrix.symfony-version == '5'
run: composer require symfony/framework-bundle ^5.0 --prefer-stable --update-with-all-dependencies --no-interaction --no-progress --no-suggest
- name: "Update dependencies with restricted symfony version"
run: composer update --prefer-stable --no-interaction --no-progress

- name: "Run unit tests with phpunit"
run: vendor/bin/phpunit --configuration=phpunit.xml
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}
},
"conflict": {
"vimeo/psalm": "~4.2.0"
"vimeo/psalm": "~4.2"
},
"config": {
"sort-packages": true
Expand Down

0 comments on commit 6a97204

Please sign in to comment.