From cba5e609e43b8ea3dc5b4403e8c542c43b9a378e Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Fri, 22 Apr 2022 00:28:32 +0200 Subject: [PATCH 1/2] Revert "Only check tracked files in verify-generated-files" This reverts commit 1dc6dba014aa970e6558398121f1e8e71c852787. --- .github/actions/verify-generated-files/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/verify-generated-files/action.yml b/.github/actions/verify-generated-files/action.yml index 21aa125a1cbbc..02ca79160b0d7 100644 --- a/.github/actions/verify-generated-files/action.yml +++ b/.github/actions/verify-generated-files/action.yml @@ -9,4 +9,4 @@ runs: scripts/dev/genfiles Zend/zend_vm_gen.php build/gen_stub.php -f - git add . -Nu && git diff --exit-code + git add . -N && git diff --exit-code From 0508def9a9a00456dee0569539f95ff80d6accfa Mon Sep 17 00:00:00 2001 From: Kamil Tekiela Date: Thu, 2 Sep 2021 21:28:49 +0100 Subject: [PATCH 2/2] Remove mysqli_close that prevented CLEAN from running properly --- ext/mysqli/tests/clean_table.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ext/mysqli/tests/clean_table.inc b/ext/mysqli/tests/clean_table.inc index a3dc8b66debf1..229b42f5eddcc 100644 --- a/ext/mysqli/tests/clean_table.inc +++ b/ext/mysqli/tests/clean_table.inc @@ -8,7 +8,4 @@ if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) { if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) { printf("[clean] Failed to drop old test table: [%d] %s\n", mysqli_errno($link), mysqli_error($link)); -} - -mysqli_close($link); -?> +} \ No newline at end of file