Skip to content

Commit 02cc8f2

Browse files
Merge branch '4.4' into 5.2
* 4.4: Tweak CI Tweak CI
2 parents e86c13b + ac2c3a9 commit 02cc8f2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ install:
5151
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex
5252
- git config --global user.email ""
5353
- git config --global user.name "Symfony"
54-
- 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)
54+
- 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)
5555
- php .github/build-packages.php HEAD^ %SYMFONY_VERSION% src\Symfony\Bridge\PhpUnit
5656
- SET "SYMFONY_REQUIRE=>=%SYMFONY_VERSION%"
5757
- SET COMPOSER_ROOT_VERSION=%SYMFONY_VERSION%.x-dev

.github/workflows/unit-tests.yml

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

.travis.yml

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

0 commit comments

Comments
 (0)