1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Commit Graph

165 Commits

Author SHA1 Message Date
Ilija Tovilo b37a6e73b1 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix xcode-select
2025-12-13 20:30:03 +01:00
Ilija Tovilo 9bd587801d Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix xcode-select
2025-12-13 20:29:56 +01:00
Ilija Tovilo 6cdb8bf0a2 Fix xcode-select
The old Xcode sticks around, so make sure we sort in reverse to pick the newer
version. Technically we should use something like sort -Vr, but -V doesn't exist
on macOS. But that won't be a problem until Xcode 100, which my great great
grand children can worry about.
2025-12-13 20:27:14 +01:00
Ilija Tovilo 4969ef195b Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Update clang in macOS build
2025-12-08 23:10:56 +01:00
Ilija Tovilo 4022ea11b8 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update clang in macOS build
2025-12-08 23:10:51 +01:00
Ilija Tovilo cb413b5d5f Update clang in macOS build
This resolves a crash in release builds. This may be dropped again in the
future once the bugfix lands.

Co-authored by Alexandre Daubois <alex.daubois@gmail.com>
Co-authored by Arnaud Le Blanc <arnaud.lb@gmail.com>
Co-authored by Jakub Zelenka <bukka@php.net>

Closes GH-20669
2025-12-08 23:10:26 +01:00
Ilija Tovilo 0a2717ee41 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Create separate workflow for nightly slack notification
2025-10-20 22:50:30 +02:00
Ilija Tovilo 0bd904b356 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Create separate workflow for nightly slack notification
2025-10-20 22:50:24 +02:00
Ilija Tovilo 90bc40ecc0 Create separate workflow for nightly slack notification
Closes GH-20248
2025-10-20 22:49:21 +02:00
Jakub Zelenka 6194084837 Use the default OpenSSL version for MacOS to match libs
This seems like an issue that might be potentially causing issues like
GH-12901. The problem is that libs like libcurl, libldap and others use
the default OpenSSL version so this might result in linking issues.

The fact that OpenSSL 1.1.1 was actually good that we were able to have
it in the pipeline but this is just not right setup so we should find
another way how to test it at least in nightly.

Closes GH-19472
2025-09-01 23:06:39 +02:00
Ilija Tovilo 234159d911 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Upgrade to macOS 14 and backport necessary changes
2025-08-04 22:20:06 +02:00
Ilija Tovilo 7ba4453f8f Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Upgrade to macOS 14 and backport necessary changes
2025-08-04 22:19:59 +02:00
Ilija Tovilo e9e432a35d Upgrade to macOS 14 and backport necessary changes 2025-08-04 22:12:30 +02:00
Arnaud Le Blanc a7cdf0b172 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Add unique entry point for extra tests
2025-07-26 16:15:48 +02:00
Arnaud Le Blanc 5fa27e25b3 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Add unique entry point for extra tests
2025-07-26 16:14:56 +02:00
Arnaud Le Blanc b633720585 Add unique entry point for extra tests
We are adding extra (non-phpt) test suites in [1] and [2]. In order to
avoid touching CI files too often (which are maintained in 8.1 and merged in
upper branches), we add a single entry point to call the extra tests. The entry
point can be updated in branches without synchronizing all the way from 8.1.

CI files still need to be touched to install dependencies of these tests,
but this should be manageable as these do not change often and are the same
in every branch.

Closes GH-19242.

[1] https://github.com/php/php-src/pull/16987
[2] https://github.com/php/php-src/pull/18939
2025-07-26 16:13:34 +02:00
Niels Dossche 7efbb2e4e0 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Run FreebSD CI under 13.5
2025-07-22 15:52:29 +02:00
Niels Dossche d9d412645d Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Run FreebSD CI under 13.5
2025-07-22 15:52:16 +02:00
Niels Dossche be88192594 Run FreebSD CI under 13.5
13.3 gives a 404 now.
Also pulls in a 8.4 fix to include xxhash from the bundled location.

Closes GH-19213.
2025-07-22 15:51:19 +02:00
Arnaud Le Blanc 0d9c8f66a3 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Add FreeBSD ZTS nightly build
2025-06-30 11:47:55 +02:00
Arnaud Le Blanc 05a44d2813 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Add FreeBSD ZTS nightly build
2025-06-30 11:47:49 +02:00
Arnaud Le Blanc 85522c0d48 Add FreeBSD ZTS nightly build
Closes GH-18959
2025-06-30 11:47:26 +02:00
Ilija Tovilo 041abec5b2 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  backporting C++17 detection support for recent icu4c releases.
  Drop tidyp from FreeBSD build
2025-04-23 11:01:31 +02:00
Ilija Tovilo 8e533496b0 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  backporting C++17 detection support for recent icu4c releases.
  Drop tidyp from FreeBSD build
2025-04-23 11:01:23 +02:00
Ilija Tovilo 35936bfa79 Drop tidyp from FreeBSD build
It looks like it's no longer supported. We don't test tidy on FreeBSD
anyway.
2025-04-23 11:00:24 +02:00
Ilija Tovilo 5fcc8d4cd1 Upgrade security branches to Ubuntu 22.04
20.04 goes out of security support in 2 months. Backporting various
commits.

See d98963a071
See af721c9c36
See 378b79b90c

Closes GH-17963
2025-03-06 15:24:15 +01:00
Calvin Buckley 1615a21cd8 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Attempt at ppc64 CI (#17945)
2025-03-03 12:41:27 -04:00
Calvin Buckley aae9cd7b11 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Attempt at ppc64 CI (#17945)
2025-03-03 12:40:46 -04:00
Calvin Buckley 4694c3e997 Attempt at ppc64 CI (#17945)
This assumes gentoo (which has best ppc64be support of mainstream
distributions).

(Rebased onto the new workflow_call approach)
2025-03-03 10:04:02 -04: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 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
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
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 cf4c0182b6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [CI] Backport usage of db service for 8.1
2024-10-30 12:21:34 +01:00
Ilija Tovilo 560a585117 [CI] Backport usage of db service for 8.1
Nightly already uses them. We're running into port clashes otherwise.

Closes GH-16647
2024-10-30 12:20:42 +01:00
Ilija Tovilo 7e5ed4712d Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix icu dependency for macos build
2024-10-28 16:41:16 +01:00