From fba06d836ae5b8bb1ccb244096d102b38bd155c0 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Mon, 20 Oct 2025 22:35:47 +0200 Subject: [PATCH 1/7] Fix merge issue --- ext/phar/util.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ext/phar/util.c b/ext/phar/util.c index 7c94ba2e63fd..7daeb450c3d7 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1504,7 +1504,6 @@ static zend_result phar_call_openssl_signverify(bool is_sign, php_stream *fp, ze zval_ptr_dtor(&retval); ZEND_FALLTHROUGH; case IS_FALSE: - default: zval_ptr_dtor(&zp[1]); return FAILURE; } From 90bc40ecc0f0d2bf62e97c42256bd10015db3b5e Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Mon, 20 Oct 2025 17:53:00 +0200 Subject: [PATCH 2/7] Create separate workflow for nightly slack notification Closes GH-20248 --- .github/actions/notify-slack/action.yml | 10 ----- .github/workflows/nightly-results.yml | 16 ++++++++ .github/workflows/nightly.yml | 51 ------------------------- .github/workflows/root.yml | 5 --- 4 files changed, 16 insertions(+), 66 deletions(-) delete mode 100644 .github/actions/notify-slack/action.yml create mode 100644 .github/workflows/nightly-results.yml diff --git a/.github/actions/notify-slack/action.yml b/.github/actions/notify-slack/action.yml deleted file mode 100644 index 1ff425b51c6a..000000000000 --- a/.github/actions/notify-slack/action.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Notify Slack -inputs: - token: - required: true -runs: - using: composite - steps: - - shell: bash - run: >- - curl -X POST -H 'Content-type: application/json' --data '{"attachments": [{"text": "Job in *nightly* failed", "footer": "", "color": "danger", "mrkdwn_in": ["text"]}]}' ${{ inputs.token }} diff --git a/.github/workflows/nightly-results.yml b/.github/workflows/nightly-results.yml new file mode 100644 index 000000000000..c1c4da72ca56 --- /dev/null +++ b/.github/workflows/nightly-results.yml @@ -0,0 +1,16 @@ +name: Nightly results +on: + workflow_run: + workflows: + - Nightly + types: + - completed +jobs: + on-failure: + runs-on: ubuntu-latest + if: ${{ github.repository == 'php/php-src' && github.event.workflow_run.conclusion == 'failure' }} + steps: + - run: | + export DEBIAN_FRONTEND=noninteractive + sudo apt-get install -y curl + curl -X POST -H 'Content-type: application/json' --data '{"attachments": [{"text": "Job in *nightly* failed", "footer": "<${{ github.event.workflow_run.jobs_url }}|View Run>", "color": "danger", "mrkdwn_in": ["text"]}]}' ${{ secrets.ACTION_MONITORING_SLACK }} diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e0322e3b1be2..c360146508b9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -136,12 +136,6 @@ jobs: -d opcache.enable_cli=1 - name: Extra tests uses: ./.github/actions/extra-tests - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} - LINUX_X64: services: mysql: @@ -273,11 +267,6 @@ jobs: uses: ./.github/actions/extra-tests - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} LINUX_X32: strategy: fail-fast: false @@ -362,11 +351,6 @@ jobs: -d opcache.enable_cli=1 - name: Extra tests uses: ./.github/actions/extra-tests - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} MACOS: strategy: fail-fast: false @@ -425,11 +409,6 @@ jobs: uses: ./.github/actions/extra-tests - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} COVERAGE_DEBUG_NTS: if: inputs.branch == 'master' services: @@ -491,11 +470,6 @@ jobs: fail_ci_if_error: true token: ${{ secrets.CODECOV_TOKEN }} verbose: true - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} COMMUNITY: strategy: fail-fast: false @@ -683,11 +657,6 @@ jobs: if [ $EXIT_CODE -gt 128 ]; then exit 1 fi - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} OPCACHE_VARIATION: services: mysql: @@ -774,11 +743,6 @@ jobs: -d opcache.file_cache_only=1 - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} MSAN: name: MSAN runs-on: ubuntu-${{ inputs.ubuntu_version }} @@ -866,11 +830,6 @@ jobs: -d opcache.enable_cli=1 - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} LIBMYSQLCLIENT: name: LIBMYSQLCLIENT runs-on: ubuntu-${{ inputs.ubuntu_version }} @@ -913,11 +872,6 @@ jobs: withMysqli: ${{ inputs.libmysqlclient_with_mysqli }} - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} PECL: if: inputs.branch == 'master' runs-on: ubuntu-22.04 @@ -1025,11 +979,6 @@ jobs: /opt/php/bin/phpize ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config make -j$(/usr/bin/nproc) - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} WINDOWS: strategy: fail-fast: false diff --git a/.github/workflows/root.yml b/.github/workflows/root.yml index b70b026eced0..4062358fcbc9 100644 --- a/.github/workflows/root.yml +++ b/.github/workflows/root.yml @@ -31,11 +31,6 @@ jobs: - name: Generate Matrix id: set-matrix run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}" "${{ github.head_ref || github.ref_name }}" - - name: Notify Slack - if: failure() - uses: ./.github/actions/notify-slack - with: - token: ${{ secrets.ACTION_MONITORING_SLACK }} NIGHTLY: needs: GENERATE_MATRIX name: ${{ matrix.branch.ref }} From 0e17dcfe54f972e9531459b4b253a182eefcdef3 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Wed, 6 Aug 2025 16:11:38 +0530 Subject: [PATCH 3/7] Fix Windows test for openssl-3.5 upgrade (#19384) * Fix Windows test for openssl-3.5 upgrade * Update ext/openssl/tests/check_default_conf_path.phpt Co-authored-by: Christoph M. Becker --------- Co-authored-by: Christoph M. Becker --- ext/openssl/tests/check_default_conf_path.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/openssl/tests/check_default_conf_path.phpt b/ext/openssl/tests/check_default_conf_path.phpt index 4590ef7804da..267bebe16c1f 100644 --- a/ext/openssl/tests/check_default_conf_path.phpt +++ b/ext/openssl/tests/check_default_conf_path.phpt @@ -21,7 +21,7 @@ ob_end_clean(); preg_match(",Openssl default config [^ ]* (.*),", $info, $m); if (isset($m[1])) { - var_dump(str_replace('/', '\\', strtolower($m[1]))); + var_dump(str_replace('\\/', '\\', strtolower($m[1]))); } else { echo $info; } From 1bfe9340b722145be2f82b5880a28ba2b2ee0ba0 Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Tue, 21 Oct 2025 00:55:08 +0200 Subject: [PATCH 4/7] [skip ci] Skip openssl tests currently failing on 8.2 --- ext/openssl/tests/bug74341.phpt | 1 + ext/openssl/tests/openssl_x509_parse_basic.phpt | 1 + 2 files changed, 2 insertions(+) diff --git a/ext/openssl/tests/bug74341.phpt b/ext/openssl/tests/bug74341.phpt index 97c4f9b55c46..b08e71234b64 100644 --- a/ext/openssl/tests/bug74341.phpt +++ b/ext/openssl/tests/bug74341.phpt @@ -5,6 +5,7 @@ openssl --SKIPIF-- = 0x30300000) die('skip For OpenSSL < 3.3'); +if (substr(PHP_OS, 0, 3) == "WIN") die("skip Failing on Windows"); ?> --FILE-- = 0x30200000) die('skip For OpenSSL < 3.2'); +if (substr(PHP_OS, 0, 3) == "WIN") die("skip Failing on Windows"); ?> --FILE-- Date: Tue, 21 Oct 2025 01:23:29 +0200 Subject: [PATCH 5/7] Revert "Fix Windows test for openssl-3.5 upgrade (#19384)" This reverts commit 0e17dcfe54f972e9531459b4b253a182eefcdef3. --- ext/openssl/tests/check_default_conf_path.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/openssl/tests/check_default_conf_path.phpt b/ext/openssl/tests/check_default_conf_path.phpt index 267bebe16c1f..4590ef7804da 100644 --- a/ext/openssl/tests/check_default_conf_path.phpt +++ b/ext/openssl/tests/check_default_conf_path.phpt @@ -21,7 +21,7 @@ ob_end_clean(); preg_match(",Openssl default config [^ ]* (.*),", $info, $m); if (isset($m[1])) { - var_dump(str_replace('\\/', '\\', strtolower($m[1]))); + var_dump(str_replace('/', '\\', strtolower($m[1]))); } else { echo $info; } From f65a574a363c0e77b103b459087114f582c1609e Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Tue, 21 Oct 2025 01:23:58 +0200 Subject: [PATCH 6/7] [skip ci] Also skip check_default_conf_path.phpt on Windows & 8.2 I don't know why the output is different only in 8.2. Revert for now to make CI happy. --- ext/openssl/tests/check_default_conf_path.phpt | 1 + 1 file changed, 1 insertion(+) diff --git a/ext/openssl/tests/check_default_conf_path.phpt b/ext/openssl/tests/check_default_conf_path.phpt index 4590ef7804da..1fc18d684c44 100644 --- a/ext/openssl/tests/check_default_conf_path.phpt +++ b/ext/openssl/tests/check_default_conf_path.phpt @@ -7,6 +7,7 @@ openssl if (substr(PHP_OS, 0, 3) != 'WIN') { die('skip windows only test'); } +if (substr(PHP_OS, 0, 3) == "WIN") die("skip Failing on Windows"); ?> --ENV-- OPENSSL_CONF= From 94f2bb0dd50e554eb9525cff7d861187de6e00f8 Mon Sep 17 00:00:00 2001 From: Shivam Mathur Date: Wed, 6 Aug 2025 16:11:38 +0530 Subject: [PATCH 7/7] [skip ci] Fix Windows test for openssl-3.5 upgrade (#19384) * Fix Windows test for openssl-3.5 upgrade * Update ext/openssl/tests/check_default_conf_path.phpt Co-authored-by: Christoph M. Becker --- ext/openssl/tests/check_default_conf_path.phpt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/openssl/tests/check_default_conf_path.phpt b/ext/openssl/tests/check_default_conf_path.phpt index 4590ef7804da..267bebe16c1f 100644 --- a/ext/openssl/tests/check_default_conf_path.phpt +++ b/ext/openssl/tests/check_default_conf_path.phpt @@ -21,7 +21,7 @@ ob_end_clean(); preg_match(",Openssl default config [^ ]* (.*),", $info, $m); if (isset($m[1])) { - var_dump(str_replace('/', '\\', strtolower($m[1]))); + var_dump(str_replace('\\/', '\\', strtolower($m[1]))); } else { echo $info; }