Skip to content

Commit 32ed1fa

Browse files
committed
Assert generated files are up to date in CI
1 parent 1364945 commit 32ed1fa

File tree

7 files changed

+28
-6
lines changed

7 files changed

+28
-6
lines changed

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

+4-4
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

.github/actions/templating/action.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: templating
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: bash
6+
run: |
7+
set -x
8+
scripts/dev/genfiles
9+
Zend/zend_vm_gen.php
10+
build/gen_stub.php -f
11+
git add . -N && git diff --exit-code

.github/workflows/push.yml

+6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- PHP-8.0
1515
- PHP-8.1
1616
- master
17+
- '**.cipush'
1718
pull_request:
1819
branches:
1920
- '**'
@@ -54,6 +55,8 @@ jobs:
5455
uses: ./.github/actions/test-linux
5556
with:
5657
runTestsParameters: -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M
58+
- name: Assert generated files are up to date
59+
uses: ./.github/actions/templating
5760
MACOS_DEBUG_NTS:
5861
runs-on: macos-10.15
5962
steps:
@@ -80,3 +83,6 @@ jobs:
8083
-d zend_extension=opcache.so
8184
-d opcache.protect_memory=1
8285
-d opcache.jit_buffer_size=16M
86+
- name: Assert generated files are up to date
87+
if: false # TODO scripts/dev/genfiles needs Bison 3.0
88+
uses: ./.github/actions/templating

build/gen_stub.php

+1-1
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.2";
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

+1
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

+4
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

+1-1
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)