Merge branch '4.4' into 5.2

* 4.4:
  Tweak CI
  Tweak CI
This commit is contained in:
Nicolas Grekas 2021-06-28 11:07:49 +02:00
commit 02cc8f23ff
3 changed files with 5 additions and 5 deletions

View File

@ -51,7 +51,7 @@ install:
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
- git config --global user.email ""
- git config --global user.name "Symfony"
- FOR /F "tokens=* USEBACKQ" %%F IN (`bash -c "grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+'"`) DO (SET SYMFONY_VERSION=%%F)
- 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)
- php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
- SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev

View File

@ -104,7 +104,7 @@ jobs:
# For the highest branch, in high-deps mode, the version before it is checked out and tested with the locally patched components
if [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = $(echo "$SYMFONY_VERSIONS" | tail -n 1 | sed s/.//) ]]; then
echo FLIP='🙃' >> $GITHUB_ENV
echo FLIP='^' >> $GITHUB_ENV
SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -FB1 /$SYMFONY_VERSION | head -n 1 | sed s/.//)
git fetch --depth=2 origin $SYMFONY_VERSION
git checkout -m FETCH_HEAD
@ -157,7 +157,7 @@ jobs:
if [[ $ok -ne 0 ]]; then
printf "\n%-70s%10s\n" $title $(($end-$start))s
echo "$OUTPUT"
echo -e "\n\\e[41mKO\\e[0m $title\\n"
echo -e "\n::error::\\e[41mKO\\e[0m $title\\n"
else
printf "::group::%-68s%10s\n" $title $(($end-$start))s
echo "$OUTPUT"
@ -189,7 +189,7 @@ jobs:
COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
if [[ $COMPONENTS && $SYMFONY_VERSION = *.4 ]]; then
export FLIP='🙃'
export FLIP='^'
SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"
export COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev

View File

@ -44,7 +44,7 @@ before_install:
# tfold is a helper to create folded reports
tfold () {
local title="$PHP $1 $FLIP"
local title="$PHP $1"
local fold=$(echo $title | sed -r 's/[^-_A-Za-z0-9]+/./g')
shift
local id=$(printf %08x $(( RANDOM * RANDOM )))