1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Commit Graph

444 Commits

Author SHA1 Message Date
Ilija Tovilo
a93ad360cb Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Use laravel default branch in community build
2025-02-24 15:58:31 +01:00
Ilija Tovilo
09d7f69793 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Use laravel default branch in community build
2025-02-24 15:58:23 +01:00
Ilija Tovilo
e71b8cae7e [skip ci] Use laravel default branch in community build
See: https://github.com/laravel/framework/issues/54754#issuecomment-2678092563

According to this comment, the default branch more actively receives
changes throuought the year than master. Hence, it makes more sense to
test the default branch.
2025-02-24 15:58:04 +01:00
Christoph M. Becker
c7bc14dd6b Prevent using system DLLs when running the tests
The search order for DLLs on Windows is (simplified):

* the application folder
* the system folder
* all folders in the `PATH`

(The full details are documented on Microsoft Learn[1].)

As is, we're adding `deps\bin` to the `PATH` when running the tests,
but any DLLs in the system folder take precedence, so these would be
used instead of our intended dependencies.  To mitigate that, we copy
over all DLLs from `deps\bin` to our application folder (i.e. where
php.exe, php-cgi.exe and phpdbg.exe are placed).

Since we're doing this, there is no more need to attempt to remove the
OpenSSL DLLs in the system folder (what seems to be a bad idea anyway).

[1] <https://learn.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-search-order>

Closes GH-17805.
2025-02-16 23:06:04 +01:00
Shivam Mathur
e1f72093ad Merge branch 'PHP-8.2' into PHP-8.3 2025-02-14 23:34:18 +00:00
Shivam Mathur
3becfb1ae6 Merge branch 'PHP-8.1' into PHP-8.2 2025-02-14 23:33:18 +00:00
Shivam Mathur
f4aadb5537 ci: add workflow to trigger windows builds 2025-02-14 23:32:30 +00:00
Christoph M. Becker
3a52aba20c Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Use preinstalled MySQL for Windows CI
2025-01-25 17:41:33 +01:00
Christoph M. Becker
2692b483db Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Use preinstalled MySQL for Windows CI
2025-01-25 17:40:48 +01:00
Christoph M. Becker
a403b76e88 Use preinstalled MySQL for Windows CI
Recent hosted GH Windows runners already have MySQL preinstalled, so
there is no particular need to install it again via Chocolatey or other
means.

If we ever need to address more specific needs, we may want to have a
look at <https://github.com/ankane/setup-mysql>.

Closes GH-17561.
Closes GH-17570.
2025-01-25 17:40:00 +01:00
Ilija Tovilo
7068357906 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix GHA config yml error
2025-01-24 15:44:30 +01:00
Ilija Tovilo
f281e89cd1 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix GHA config yml error
2025-01-24 15:44:12 +01:00
Ilija Tovilo
3e6f4702ba Fix GHA config yml error 2025-01-24 15:43:22 +01:00
Ilija Tovilo
cf973421f4 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Use !cancelled() over always() in GHA config
2025-01-24 14:27:38 +01:00
Ilija Tovilo
4b867d495a Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Use !cancelled() over always() in GHA config
2025-01-24 14:27:29 +01:00
Ilija Tovilo
5b32011fb5 [skip ci] Use !cancelled() over always() in GHA config
According to the documentation, !cancelled() should be used over
always() when the step should be executed regardless of success of
failure, but canceled when the workflow is canceled.

See https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/evaluate-expressions-in-workflows-and-actions#always
2025-01-24 14:27:15 +01:00
Ilija Tovilo
61d4bd573b Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Skip Symfony/Wordpress in 8.1 build
  Backport nightly.yml
2025-01-24 14:14:51 +01:00
Ilija Tovilo
d90475dee1 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Skip Symfony/Wordpress in 8.1 build
  Backport nightly.yml
2025-01-24 14:14:42 +01:00
Ilija Tovilo
5b8c960c9f Skip Symfony/Wordpress in 8.1 build
There are two issues: The latest Symfony branches don't support 8.1
anymore. This could ber mitigated by switching to LTS for security
builds. However, there are also some JIT bugs that are hard to backport.
We'll skip these builds on 8.1 instead.
2025-01-24 14:11:55 +01:00
Ilija Tovilo
f26250c7c7 Backport nightly.yml
This file should stay up-to-date for consistent behavior across workflow
triggers.
2025-01-24 12:24:39 +01:00
Jakub Zelenka
3606701f48 Merge branch 'PHP-8.2' into PHP-8.3 2025-01-06 12:19:36 +01:00
Jakub Zelenka
5be673d29e Merge branch 'PHP-8.1' into PHP-8.2 2025-01-06 12:18:54 +01:00
Jakub Zelenka
9e1b58274e Test stream_context_tcp_nodelay_server on Windows
Closes GH-17308
2025-01-05 14:44:22 +01:00
Ilija Tovilo
e675c1a467 Drop intl on macOS + PHP 8.1 build
Based on the discussion in GH-16286, drop the intl build from macOS + PHP 8.1,
since we cannot build with supported intl versions without too many changes.

Closes GH-17092
See GH-16286
2024-12-09 16:55:31 +01:00
Ayesh Karunaratne
62b115d81d Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  CI: FreeBSD on VM - set `copyback: false`
2024-11-25 19:32:25 +07:00
Ayesh Karunaratne
9d61cb8fe7 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  CI: FreeBSD on VM - set `copyback: false`
2024-11-25 19:31:45 +07:00
Ayesh Karunaratne
b263f351c4 CI: FreeBSD on VM - set copyback: false
The `vmactions/freebsd-vm` GitHub action rsyncs the work dir to to the
VM. This adds a lot of log output due to `rsync -v` usage.

Once the tests are compelte, the action copies the files _back_ by
running `rsync` in reverse. However, we do not need these files back
because we do not run any other steps that need access to the post-test
files.

Setting `copyback: false` disables this, and cuts the log size by about
5,000 lines.

Closes Closes GH-16916.
2024-11-25 19:30:19 +07:00
Jakub Zelenka
af0f06d934 Merge branch 'PHP-8.2' into PHP-8.3 2024-11-24 19:46:13 +01:00
Jakub Zelenka
866d8d7ce6 Update code owners for mysqli, mysqlnd and pdo_mysql [ci skip] (#16921) 2024-11-24 19:45:22 +01:00
Ilija Tovilo
dbd6c945f9 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Add --no-progress to FreeBSD build
  Move FreeBSD build to GitHub actions with QEMU
2024-11-20 14:26:55 +01:00
Ilija Tovilo
02ef371eab [skip ci] Add --no-progress to FreeBSD build 2024-11-20 14:25:54 +01:00
Ilija Tovilo
12f20ce407 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Move FreeBSD build to GitHub actions with QEMU
2024-11-20 14:25:25 +01:00
Ilija Tovilo
aca88baf5f Move FreeBSD build to GitHub actions with QEMU
Closes GH-16822
2024-11-20 14:24:02 +01:00
Ilija Tovilo
3f1e1ee467 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Don't test mysqli with libmysqlclient 8.4
2024-11-20 14:19:18 +01:00
Ilija Tovilo
aa40d3abcc Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Don't test mysqli with libmysqlclient 8.4
2024-11-20 14:19:10 +01:00
Ilija Tovilo
e23ac8341a [skip ci] Don't test mysqli with libmysqlclient 8.4
There are compile errors with 8.4 that we are no longer fixing.
2024-11-20 14:19:02 +01:00
Ilija Tovilo
378307cc4e Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Backport GA root workflow changes
2024-11-20 13:42:36 +01:00
Ilija Tovilo
f8c37dc971 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Backport GA root workflow changes
2024-11-20 13:42:28 +01:00
Ilija Tovilo
9acf0a4009 [skip ci] Backport GA root workflow changes 2024-11-20 13:41:39 +01:00
Jakub Zelenka
1b6c3f7172 Merge branch 'PHP-8.2' into PHP-8.3 2024-11-18 16:48:50 +01:00
Jakub Zelenka
cae2582416 Run labeler only in php/php-src repository
Closes GH-16844
2024-11-18 16:43:15 +01:00
Christoph M. Becker
9128fb8f1e Stick with icu4c 74.2 on macOS CI for PHP-8.1
PHP-8.1 is not ready for ICU >= 75.1 which requires C++17 support.
Thus we force the usage of icu4c@74, what is scheduled for removal in
May 2025, though.

Closes GH-16789.
2024-11-15 14:24:24 +01:00
Christoph M. Becker
d1f86bc8eb Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Need to define BREW_OPT
2024-11-13 21:24:20 +01:00
Christoph M. Becker
c69fdef760 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Need to define BREW_OPT
2024-11-13 21:23:56 +01:00
Christoph M. Becker
d6249b6e1f Need to define BREW_OPT
This is only defined as of PHP-8.4; alternatively we could also inline
the `brew --prefix` call, but that makes it harder for upward merges.

Closes GH-16785.
2024-11-13 21:23:27 +01:00
Christoph M. Becker
4c74487912 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Patch libcurl.pc for macOS builds
2024-11-13 19:38:49 +01:00
Christoph M. Becker
45487c6ec2 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Patch libcurl.pc for macOS builds
2024-11-13 19:38:07 +01:00
Christoph M. Becker
9196a72eb0 Patch libcurl.pc for macOS builds
cURL 8.11.0 added a couple of packages to `Requires.private`, but these
packages are irrelevant when building against a shared libcurl.  For
some reason, these private requirements are checked when we're doing
`pkg-config --cflags` (that happens with the preinstalled pkg-config
0.29.2, as well as with pkgconf 2.3.0).  To avoid further messing with
these packages, we just drop the `Requires.private` line from
libcurl.pc.

See GH-16741 for more details.

Closes GH-16783.
2024-11-13 19:36:58 +01:00
Ilija Tovilo
5852c89034 [skip ci] Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Fix nightly workflow dispatch
2024-11-04 15:03:58 +01:00
Ilija Tovilo
2985de72db [skip ci] Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Fix nightly workflow dispatch
2024-11-04 15:03:47 +01:00