8000 Merge branch '5.4' into 6.0 · symfony/symfony@57b9a62 · GitHub
[go: up one dir, main page]
Skip to content

Commit 57b9a62

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.0
* 5.4: [Messenger] fix FlattenExceptionNormalizer Tweak GHA
2 parents 210dc98 + d809da9 commit 57b9a62

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

‎.github/workflows/psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
COMPOSER_HOME="$(composer config home)"
3535
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
3636
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
37-
composer remove --no-update --no-interaction symfony/phpunit-bridge
38-
composer require --no-update psalm/phar phpunit/phpunit:^9.5 php-http/discovery psr/event-dispatcher
37+
composer remove --dev --no-update --no-interaction symfony/phpunit-bridge
38+
composer require --no-update psalm/phar phpunit/phpunit:^9.5 php-http/discovery psr/event-dispatcher mongodb/mongodb
3939
4040
echo "::group::composer update"
4141
composer update --no-progress --ansi

‎.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
if [[ $ok -ne 0 ]]; then
157157
printf "\n%-70s%10s\n" $title $(($end-$start))s
158158
echo "$OUTPUT"
159-
echo -e "\n::error::\\e[41mKO\\e[0m $title\\n"
159+
echo -e "\n::error::KO $title\\n"
160160
else
161161
printf "::group::%-68s%10s\n" $title $(($end-$start))s
162162
echo "$OUTPUT"

0 commit comments

Comments
 (0)
0