Skip to content

Commit

Permalink
[BUGFIX] Never fixate php version in composer.json (#335)
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminkott authored Jul 12, 2022
1 parent 941ab3d commit dfc6dac
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
15 changes: 11 additions & 4 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,10 @@ jobs:
matrix:
php-version:
- '8.1'
- 'latest'
experimental: [false]
include:
- php-version: 'latest'
experimental: true
- php-version: 'nightly'
experimental: true

Expand Down Expand Up @@ -186,8 +187,10 @@ jobs:
- name: Set platform.php for nightly
if: ${{ matrix.php-version == 'nightly' }}
run: |
composer install --no-scripts ${{ env.COMPOSER_FLAGS }}
composer install --no-scripts --ignore-platform-reqs ${{ env.COMPOSER_FLAGS }}
composer config platform.php 8.1.99
composer bin phpunit config platform.php 8.1.99
composer update --lock
- name: Install dependencies
run: composer install ${{ env.COMPOSER_INSTALL_FLAGS }} ${{ env.COMPOSER_FLAGS }}
Expand Down Expand Up @@ -428,8 +431,10 @@ jobs:
- name: Set platform.php for nightly
if: ${{ matrix.php-version == 'nightly' }}
run: |
composer install --no-scripts ${{ env.COMPOSER_FLAGS }}
composer install --no-scripts --ignore-platform-reqs ${{ env.COMPOSER_FLAGS }}
composer config platform.php 8.1.99
composer bin phpunit config platform.php 8.1.99
composer update --lock
- name: Install dependencies
if: ${{ matrix.dependencies == 'lock' }}
Expand Down Expand Up @@ -511,8 +516,10 @@ jobs:
- name: Set platform.php for nightly
if: ${{ matrix.php-version == 'nightly' }}
run: |
composer install --no-scripts ${{ env.COMPOSER_FLAGS }}
composer install --no-scripts --ignore-platform-reqs ${{ env.COMPOSER_FLAGS }}
composer config platform.php 8.1.99
composer bin phpunit config platform.php 8.1.99
composer update --lock
- name: Install dependencies
if: ${{ matrix.dependencies == 'lock' }}
Expand Down
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"source": "https://github.com/TYPO3/get.typo3.org"
},
"require": {
"php": ">=8.1.3",
"php": ">=8.1",
"ext-ctype": "*",
"ext-iconv": "*",
"ext-json": "*",
Expand Down Expand Up @@ -143,9 +143,6 @@
},
"bin-dir": "bin",
"optimize-autoloader": true,
"platform": {
"php": "8.1.4"
},
"preferred-install": {
"t3g/*": "source",
"*": "dist"
Expand Down
7 changes: 2 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dfc6dac

Please sign in to comment.