Skip to content

Commit

Permalink
minor #50407 [7.0] Remove hacks that made the CI green (nicolas-grekas)
Browse files Browse the repository at this point in the history
This PR was merged into the 7.0 branch.

Discussion
----------

[7.0] Remove hacks that made the CI green

| Q             | A
| ------------- | ---
| Branch?       | 7.0
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tickets       | -
| License       | MIT
| Doc PR        | -

Follows #50404

The Windows build is blocked by ext-redis and ext-apcu not being available as DLL for PHP 8.2. /cc `@weltling` 🙏

It's time to allow Symfony 7 again :)

- [x] composer/composer#11474
- [x] async-aws/aws#1409
- [x] doctrine/orm#10724
- [x] [FriendsOfPHP/proxy-manager-lts](FriendsOfPHP/proxy-manager-lts@d93bd79)
- [x] symfony/security-acl#111
- [x] tijsverkoyen/CssToInlineStyles#243

We also need a sigchild-enabled PHP, which `@derrabus` knows how to build :)

Commits
-------

6dd126a [7.0] Remove hacks that made the CI green
  • Loading branch information
nicolas-grekas committed May 30, 2023
2 parents 373d775 + 6dd126a commit c574955
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 12 deletions.
4 changes: 0 additions & 4 deletions .github/build-packages.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
$mergeBase = trim(shell_exec(sprintf('git merge-base "%s" HEAD', array_shift($dirs))));
$version = array_shift($dirs);

if ('7.0' === $version) {
$version = '6.4'; // to be removed once deps allow ^7.0
}

$packages = [];
$flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
$preferredInstall = json_decode(file_get_contents(__DIR__.'/composer-config.json'), true)['config']['preferred-install'];
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ jobs:
run: |
COMPOSER_HOME="$(composer config home)"
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
#export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
echo "::group::composer update"
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/intl-data-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ jobs:
run: |
COMPOSER_HOME="$(composer config home)"
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
#export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
echo "::group::composer update"
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ jobs:
run: |
COMPOSER_HOME="$(composer config home)"
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
#export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
composer remove --dev --no-update --no-interaction symfony/phpunit-bridge
composer require --no-progress --ansi --no-plugins psalm/phar phpunit/phpunit:^9.6 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ jobs:
[[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = *.4 ]] && echo LEGACY=,legacy >> $GITHUB_ENV || true
echo SYMFONY_VERSION=$SYMFONY_VERSION >> $GITHUB_ENV
#echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV
echo COMPOSER_ROOT_VERSION=6.4.x-dev >> $GITHUB_ENV # to be removed once all deps allow ^7.0
echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV
echo SYMFONY_REQUIRE=">=$([ '${{ matrix.mode }}' = low-deps ] && echo 5.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV
[[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true
Expand Down

0 comments on commit c574955

Please sign in to comment.