Fix branch variable

Author: iluuu1994

.github/scripts/windows/build_task.bat

@@ -60,10 +60,9 @@ cmd /c configure.bat ^
 	--with-php-build=%DEPS_DIR% ^
 	%ADD_CONF% ^
 	--disable-test-ini
-
 if %errorlevel% neq 0 exit /b 3
 
-nmake /NOLOGO /S
+nmake /NOLOGO
 if %errorlevel% neq 0 exit /b 3
 
 exit /b 0

.github/scripts/windows/find-target-branch.bat

@@ -1,4 +1,22 @@
 @echo off
+SetLocal EnableDelayedExpansion
 
-for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i
-for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i
+if /i "%APPVEYOR%" equ "True" (
+	if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (
+		set BRANCH=%APPVEYOR_REPO_BRANCH:~4,3%
+	) else (
+		set BRANCH=master
+	)
+) else (
+	if "%GITHUB_BASE_REF%" equ "master" (
+		set BRANCH=master
+	) else (
+		if "%GITHUB_HEAD_REF%" equ "master" (
+			set BRANCH=master
+		) else (
+			for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i
+			for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=!BRANCH!.%%i
+		)
+	)
+)
+echo !BRANCH!

.github/scripts/windows/test_task.bat

@@ -119,7 +119,7 @@ mkdir c:\tests_tmp
 
 set TEST_PHP_JUNIT=c:\junit.out.xml
 
-nmake test TESTS="%OPCACHE_OPTS% -q --offline -g FAIL,BORK,WARN,LEAK,XLEAK --color --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%"
+nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp --bless %PARALLEL%"
 
 set EXIT_CODE=%errorlevel%
 

run-tests.php

@@ -2781,9 +2781,7 @@ function run_test(string $php, $file, array $env): string
             $orig_shortname = str_replace(TEST_PHP_SRCDIR . '/', '', $file);
             $diff = "# original source file: $orig_shortname\n" . $diff;
         }
-        if (!$SHOW_ONLY_GROUPS || array_intersect($restype, $SHOW_ONLY_GROUPS)) {
-            show_file_block('diff', $diff);
-        }
+        show_file_block('diff', $diff);
         if (strpos($log_format, 'D') !== false && file_put_contents($diff_filename, $diff) === false) {
             error("Cannot create test diff - $diff_filename");
         }