Skip to content

Commit

Permalink
Merge branch 'PHP-8.0' into PHP-8.1
Browse files Browse the repository at this point in the history
* PHP-8.0:
  Verify generated files are up to date in CI
  • Loading branch information
iluuu1994 committed Apr 21, 2022
2 parents 4397811 + 36de002 commit cf70047
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/actions/apt-x64/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ runs:
libpng-dev \
libfreetype6-dev
mkdir /opt/oracle
wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
unzip instantclient-basiclite-linuxx64.zip
wget https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
unzip instantclient-sdk-linuxx64.zip
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-basiclite-linuxx64.zip
unzip instantclient-basiclite-linuxx64.zip && rm instantclient-basiclite-linuxx64.zip
wget -nv https://download.oracle.com/otn_software/linux/instantclient/instantclient-sdk-linuxx64.zip
unzip instantclient-sdk-linuxx64.zip && rm instantclient-sdk-linuxx64.zip
mv instantclient_*_* /opt/oracle/instantclient
# Interferes with libldap2 headers.
rm /opt/oracle/instantclient/sdk/include/ldap.h
12 changes: 12 additions & 0 deletions .github/actions/verify-generated-files/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Verify generated files are up to date
runs:
using: composite
steps:
- shell: bash
run: |
set -x
[[ "$OSTYPE" == "darwin"* ]] && export PATH="/usr/local/opt/bison/bin:$PATH"
scripts/dev/genfiles
Zend/zend_vm_gen.php
build/gen_stub.php -f
git add . -N && git diff --exit-code
4 changes: 4 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ jobs:
-d opcache.enable_cli=1
-d opcache.jit_buffer_size=16M
-d opcache.jit=1205
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
MACOS:
needs: GENERATE_MATRIX
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
Expand Down Expand Up @@ -149,3 +151,5 @@ jobs:
-d opcache.protect_memory=1
-d opcache.jit_buffer_size=16M
-d opcache.jit=1205
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
4 changes: 4 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ jobs:
-d zend_extension=opcache.so
-d opcache.enable_cli=1
-d opcache.jit_buffer_size=16M
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
MACOS_DEBUG_NTS:
runs-on: macos-10.15
steps:
Expand Down Expand Up @@ -84,3 +86,5 @@ jobs:
-d opcache.enable_cli=1
-d opcache.protect_memory=1
-d opcache.jit_buffer_size=16M
- name: Verify generated files are up to date
uses: ./.github/actions/verify-generated-files
4 changes: 4 additions & 0 deletions ext/pgsql/tests/80_bug14383.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ pg_close($dbh);
require_once(__DIR__.'/../../dba/tests/test.inc');
require_once(__DIR__.'/../../dba/tests/dba_handler.inc');

?>
--CLEAN--
<?php
require_once(__DIR__.'/../../dba/tests/clean.inc');
?>
--EXPECTF--
database handler: %s
Expand Down

0 comments on commit cf70047

Please sign in to comment.