8000 minor #50407 [7.0] Remove hacks that made the CI green (nicolas-grekas) · symfony/symfony@c574955 · GitHub
[go: up one dir, main page]
Skip to content

Commit c574955

Browse files
nicolas-grekasnicolas-grekas
committed
minor #50407 [7.0] Remove hacks that made the CI green (nicolas-grekas)
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
2 parents 373d775 + 6dd126a commit c574955

File tree

5 files changed

+4
-12
lines changed

5 files changed

+4
-12
lines changed

‎.github/build-packages.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
$mergeBase = trim(shell_exec(sprintf('git merge-base "%s" HEAD', array_shift($dirs))));
1212
$version = array_shift($dirs);
1313

14-
if ('7.0' === $version) {
15-
$version = '6.4'; // to be removed once deps allow ^7.0
16-
}
17-
1814
$packages = [];
1915
$flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
2016
$preferredInstall = json_decode(file_get_contents(__DIR__.'/composer-config.json'), true)['config']['preferred-install'];

‎.github/workflows/integration-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@ jobs:
155155
run: |
156156
COMPOSER_HOME="$(composer config home)"
157157
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
158-
#export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
159-
export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
158+
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
160159
echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
161160
162161
echo "::group::composer update"

‎.github/workflows/intl-data-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ jobs:
6363
run: |
6464
COMPOSER_HOME="$(composer config home)"
6565
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
66-
#export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
67-
export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
66+
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
6867
echo COMPOSER_ROOT_VERSION=$COMPOSER_ROOT_VERSION >> $GITHUB_ENV
6968
7069
echo "::group::composer update"

‎.github/workflows/psalm.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ jobs:
4141
run: |
4242
COMPOSER_HOME="$(composer config home)"
4343
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
44-
#export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
45-
export COMPOSER_ROOT_VERSION=6.4.x-dev # to be removed once deps allow ^7.0
44+
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
4645
composer remove --dev --no-update --no-interaction symfony/phpunit-bridge
4746
composer require --no-progress --ansi --no-plugins psalm/phar phpunit/phpunit:^9.6 php-http/discovery psr/event-dispatcher mongodb/mongodb jetbrains/phpstorm-stubs
4847

‎.github/workflows/unit-tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ jobs:
122122
[[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = *.4 ]] && echo LEGACY=,legacy >> $GITHUB_ENV || true
123123
124124
echo SYMFONY_VERSION=$SYMFONY_VERSION >> $GITHUB_ENV
125-
#echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV
126-
echo COMPOSER_ROOT_VERSION=6.4.x-dev >> $GITHUB_ENV # to be removed once all deps allow ^7.0
125+
echo COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev >> $GITHUB_ENV
127126
echo SYMFONY_REQUIRE=">=$([ '${{ matrix.mode }}' = low-deps ] && echo 5.4 || echo $SYMFONY_VERSION)" >> $GITHUB_ENV
128127
[[ "${{ matrix.mode }}" = *-deps ]] && mv composer.json.phpunit composer.json || true
129128

0 commit comments

Comments
 (0)
0