diff --git a/.github/actions/apt-x64/action.yml b/.github/actions/apt-x64/action.yml index c21a34534aea8..a5b0db49e8270 100644 --- a/.github/actions/apt-x64/action.yml +++ b/.github/actions/apt-x64/action.yml @@ -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 diff --git a/.github/actions/verify-generated-files/action.yml b/.github/actions/verify-generated-files/action.yml new file mode 100644 index 0000000000000..02ca79160b0d7 --- /dev/null +++ b/.github/actions/verify-generated-files/action.yml @@ -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 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 67259e503b1db..4d347323e89b3 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -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 != '[]' }} @@ -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 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4e2879a8ab517..4a1619ab5d106 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -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: @@ -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 diff --git a/ext/pgsql/tests/80_bug14383.phpt b/ext/pgsql/tests/80_bug14383.phpt index 0859d65f0849c..c9848e30c1d64 100644 --- a/ext/pgsql/tests/80_bug14383.phpt +++ b/ext/pgsql/tests/80_bug14383.phpt @@ -21,6 +21,10 @@ pg_close($dbh); require_once(__DIR__.'/../../dba/tests/test.inc'); require_once(__DIR__.'/../../dba/tests/dba_handler.inc'); +?> +--CLEAN-- + --EXPECTF-- database handler: %s