Skip to content

Commit 36de002

Browse files
mvorisekiluuu1994
authored andcommitted
Verify generated files are up to date in CI
Closes GH-8295
1 parent dad5cb4 commit 36de002

File tree

8 files changed

+31
-6
lines changed

8 files changed

+31
-6
lines changed

.github/actions/apt-x64/action.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ runs:
5959
libpng-dev \
6060
libfreetype6-dev
6161
mkdir /opt/oracle
62-
wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
63-
unzip instantclient-basiclite-linuxx64.zip
64-
wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
65-
unzip instantclient-sdk-linuxx64.zip
62+
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
63+
unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
64+
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
65+
unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
6666
mv instantclient_*_* /opt/oracle/instantclient
6767
# Interferes with libldap2 headers.
6868
rm /opt/oracle/instantclient/sdk/include/ldap.h
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Verify generated files are up to date
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: bash
6+
run: |
7+
set -x
8+
[[ "$OSTYPE" == "darwin"* ]] && export PATH="/usr/local/opt/bison/bin:$PATH"
9+
scripts/dev/genfiles
10+
Zend/zend_vm_gen.php
11+
build/gen_stub.php -f
12+
git add . -N && git diff --exit-code

.github/workflows/nightly.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ jobs:
9393
-d opcache.enable_cli=1
9494
-d opcache.jit_buffer_size=16M
9595
-d opcache.jit=1205
96+
- name: Verify generated files are up to date
97+
uses: ./.github/actions/verify-generated-files
9698
MACOS:
9799
needs: GENERATE_MATRIX
98100
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
@@ -149,3 +151,5 @@ jobs:
149151
-d opcache.protect_memory=1
150152
-d opcache.jit_buffer_size=16M
151153
-d opcache.jit=1205
154+
- name: Verify generated files are up to date
155+
uses: ./.github/actions/verify-generated-files

.github/workflows/push.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ jobs:
5757
-d zend_extension=opcache.so
5858
-d opcache.enable_cli=1
5959
-d opcache.jit_buffer_size=16M
60+
- name: Verify generated files are up to date
61+
uses: ./.github/actions/verify-generated-files
6062
MACOS_DEBUG_NTS:
6163
runs-on: macos-10.15
6264
steps:
@@ -84,3 +86,5 @@ jobs:
8486
-d opcache.enable_cli=1
8587
-d opcache.protect_memory=1
8688
-d opcache.jit_buffer_size=16M
89+
- name: Verify generated files are up to date
90+
uses: ./.github/actions/verify-generated-files

build/gen_stub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1801,7 +1801,7 @@ function initPhpParser() {
18011801
}
18021802

18031803
$isInitialized = true;
1804-
$version = "4.9.0";
1804+
$version = "4.13.0";
18051805
$phpParserDir = __DIR__ . "/PHP-Parser-$version";
18061806
if (!is_dir($phpParserDir)) {
18071807
installPhpParser($version, $phpParserDir);

ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ if (strlen($key) != fwrite($fp, $key)) {
5959

6060

6161
if (!$link->query("SET @@session.old_passwords=2")) {
62+
@unlink($file);
6263
die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
6364
}
6465

ext/pgsql/tests/80_bug14383.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ pg_close($dbh);
1818
require_once(__DIR__.'/../../dba/tests/test.inc');
1919
require_once(__DIR__.'/../../dba/tests/dba_handler.inc');
2020

21+
?>
22+
--CLEAN--
23+
<?php
24+
require_once(__DIR__.'/../../dba/tests/clean.inc');
2125
?>
2226
--EXPECTF--
2327
database handler: %s

ext/standard/basic_functions_arginfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ ZEND_END_ARG_INFO()
829829

830830
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_trim, 0, 1, IS_STRING, 0)
831831
ZEND_ARG_TYPE_INFO(0, string, IS_STRING, 0)
832-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, characters, IS_STRING, 0, "\" \\n\\r\\t\\v\\0\"")
832+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, characters, IS_STRING, 0, "\" \\n\\r\\t\\v\\x00\"")
833833
ZEND_END_ARG_INFO()
834834

835835
#define arginfo_rtrim arginfo_trim

0 commit comments

Comments
 (0)