Skip to content

Commit 51d3906

Browse files
Merge branch '5.4' into 6.0
* 5.4: Tweak CI Tweak CI Tweak GHA
2 parents 0e7118d + 9b43376 commit 51d3906

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.appveyor.yml

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

.github/workflows/unit-tests.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
git config --global user.email ""
5757
git config --global user.name "Symfony"
5858
git config --global init.defaultBranch main
59+
git config --global advice.detachedHead false
5960
6061
COMPOSER_HOME="$(composer config home)"
6162
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
@@ -102,7 +103,7 @@ jobs:
102103
103104
# For the highest branch, in high-deps mode, the version before it is checked out and tested with the locally patched components
104105
if [[ "${{ matrix.mode }}" = high-deps && $SYMFONY_VERSION = $(echo "$SYMFONY_VERSIONS" | tail -n 1 | sed s/.//) ]]; then
105-
echo FLIP='🙃' >> $GITHUB_ENV
106+
echo FLIP='^' >> $GITHUB_ENV
106107
SYMFONY_VERSION=$(echo "$SYMFONY_VERSIONS" | grep -FB1 /$SYMFONY_VERSION | head -n 1 | sed s/.//)
107108
git fetch --depth=2 origin $SYMFONY_VERSION
108109
git checkout -m FETCH_HEAD
@@ -147,15 +148,15 @@ jobs:
147148
run: |
148149
_run_tests() {
149150
local ok=0
150-
local title="$1 $FLIP"
151+
local title="$1$FLIP"
151152
local start=$(date -u +%s)
152153
OUTPUT=$(bash -xc "$2" 2>&1) || ok=1
153154
local end=$(date -u +%s)
154155
155156
if [[ $ok -ne 0 ]]; then
156157
printf "\n%-70s%10s\n" $title $(($end-$start))s
157158
echo "$OUTPUT"
158-
echo -e "\n\\e[41mKO\\e[0m $title\\n"
159+
echo -e "\n::error::\\e[41mKO\\e[0m $title\\n"
159160
else
160161
printf "::group::%-68s%10s\n" $title $(($end-$start))s
161162
echo "$OUTPUT"
@@ -187,7 +188,7 @@ jobs:
187188
COMPONENTS=$(git diff --name-only src/ | grep composer.json || true)
188189
189190
if [[ $COMPONENTS && $SYMFONY_VERSION = *.4 ]]; then
190-
export FLIP='🙃'
191+
export FLIP='^'
191192
SYMFONY_VERSION=$(echo $SYMFONY_VERSION | awk '{print $1 - 1}')
192193
echo -e "\\n\\e[33;1mChecking out Symfony $SYMFONY_VERSION and running tests with patched components as deps\\e[0m"
193194
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)