Skip to content

Commit 0cff239

Browse files
nicolas-grekasnicolas-grekas
committed
[7.0] Remove hacks that made the CI green
1 parent cfb451f commit 0cff239

File tree

6 files changed

+12
-21
lines changed

6 files changed

+12
-21
lines changed

‎.appveyor.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ install:
1616
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.2.0-Win32-vs16-x86.zip
1717
- 7z x php-8.2.0-Win32-vs16-x86.zip -y >nul
1818
- cd ext
19-
#- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.22-8.2-ts-vs16-x86.zip
20-
#- 7z x php_apcu-5.1.22-8.2-ts-vs16-x86.zip -y >nul
21-
#- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-5.3.7-8.2-ts-vs16-x86.zip
22-
#- 7z x php_redis-5.3.7-8.2-ts-vs16-x86.zip -y >nul
19+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.22-8.2-ts-vs16-x86.zip
20+
- 7z x php_apcu-5.1.22-8.2-ts-vs16-x86.zip -y >nul
21+
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_redis-5.3.7-8.2-ts-vs16-x86.zip
22+
- 7z x php_redis-5.3.7-8.2-ts-vs16-x86.zip -y >nul
2323
- cd ..
2424
- copy /Y php.ini-development php.ini-min
2525
- echo memory_limit=-1 >> php.ini-min
@@ -34,8 +34,8 @@ install:
3434
- echo zend_extension=php_opcache.dll >> php.ini-max
3535
- echo opcache.enable_cli=1 >> php.ini-max
3636
- echo extension=php_openssl.dll >> php.ini-max
37-
#- echo extension=php_apcu.dll >> php.ini-max
38-
#- echo extension=php_redis.dll >> php.ini-max
37+
- echo extension=php_apcu.dll >> php.ini-max
38+
- echo extension=php_redis.dll >> php.ini-max
3939
- echo apc.enable_cli=1 >> php.ini-max
4040
- echo extension=php_intl.dll >> php.ini-max
4141
- echo extension=php_mbstring.dll >> php.ini-max
@@ -51,8 +51,7 @@ install:
5151
- git config --global user.name "Symfony"
5252
- FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -o '[0-9][0-9]*\.[0-9]'"`) DO (SET SYMFONY_VERSION=%%F)
5353
- php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
54-
#- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
55-
- SET COMPOSER_ROOT_VERSION=6.4.x-dev
54+
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev
5655
- php composer.phar update --no-progress --ansi
5756
- php phpunit install
5857
- choco install memurai-developer

‎.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: 2 additions & 3 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
@@ -228,7 +227,7 @@ jobs:
228227
script -e -c './phpunit --group tty' /dev/null
229228
230229
- name: Run tests with SIGCHLD enabled PHP
231-
if: "false && matrix.php == '8.2' && ! matrix.mode"
230+
if: "matrix.php == '8.2' && ! matrix.mode"
232231
run: |
233232
mkdir build
234233
cd build

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy