1
0
mirror of https://github.com/php/php-src.git synced 2026-03-30 12:13:02 +02:00
Commit Graph

399 Commits

Author SHA1 Message Date
Jakub Zelenka
7cf6791f6a Run labeler only in php/php-src repository
Closes GH-16844
2024-11-18 17:01:42 +01:00
Christoph M. Becker
193c57bb6f 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-18 11:47:34 +01:00
Christoph M. Becker
72ff8a62b6 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-18 11:47:26 +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
Ilija Tovilo
e72854e8bc [skip ci] Fix nightly workflow dispatch
Closes GH-16662
2024-11-04 15:02:11 +01:00
Ilija Tovilo
634eaa2c70 [skip ci] Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Properly disable -Werror for libmysqlclient + mysqli
  [skip ci] Revert "Remove -Werror for libmysql test on 8.1 only"
2024-10-31 13:47:43 +01:00
Ilija Tovilo
e5d63eb4b9 [skip ci] Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Properly disable -Werror for libmysqlclient + mysqli
  [skip ci] Revert "Remove -Werror for libmysql test on 8.1 only"
2024-10-31 13:47:23 +01:00
Ilija Tovilo
6c8a0d0163 [skip ci] Properly disable -Werror for libmysqlclient + mysqli 2024-10-31 13:43:39 +01:00
Ilija Tovilo
8a067cc221 [skip ci] Revert "Remove -Werror for libmysql test on 8.1 only"
This reverts commit 769947648e.

Nightly uses the file from master, so this change made no sense.
2024-10-31 13:40:26 +01:00
Ilija Tovilo
98aac9eff6 [skip ci] Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Fix nightly job name for 8.1
2024-10-31 13:38:32 +01:00
Ilija Tovilo
64fbd52cb4 [skip ci] Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Fix nightly job name for 8.1
2024-10-31 13:38:06 +01:00
Ilija Tovilo
490acdf5e9 [skip ci] Fix nightly job name for 8.1 2024-10-31 13:37:23 +01:00
Ilija Tovilo
4685e3c309 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Move nightly to workflow_call
2024-10-30 16:54:20 +01:00
Ilija Tovilo
9e5024d988 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Move nightly to workflow_call
2024-10-30 16:54:11 +01:00
Ilija Tovilo
08bbd7d167 [skip ci] Move nightly to workflow_call
This PR removes most of the logic of nightly_matrix.php by converting
nightly.yml to a workflow_call, and invoking it multiple times for each branch
in a new root.yml workflow. The naming of the files is intentionally kept to
make the diff readable. They may still be renamed afterward.

Closes GH-16642
2024-10-30 16:53:55 +01:00
Ilija Tovilo
769947648e Remove -Werror for libmysql test on 8.1 only 2024-10-30 14:47:15 +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
fe93cd4043 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Backport nightly.yml and nightly_matrix.php to PHP-8.1
2024-10-29 15:33:51 +01:00
Ilija Tovilo
9ad99bb56d Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Backport nightly.yml and nightly_matrix.php to PHP-8.1
2024-10-29 15:33:27 +01:00
Ilija Tovilo
27e8860594 Backport nightly.yml and nightly_matrix.php to PHP-8.1
These files are usually only used on master, as the cron trigger runs on master.
However, workflow_dispatch does use the file from the triggered branch.
Furthermore, we're looking into migrating to a workflow_call trigger, which will
also run on the target branch. Backport these files now to make those changes
easier.
2024-10-29 15:30:34 +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
Ilija Tovilo
e3de1a1a21 Fix icu dependency for macos build
Closes GH-16627
2024-10-28 16:40:51 +01:00
Ilija Tovilo
3aa672dd25 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Backport CI fixes to security branches
2024-10-28 15:59:10 +01:00
Ilija Tovilo
8538ac2667 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Backport CI fixes to security branches
2024-10-28 15:58:58 +01:00
Ilija Tovilo
25c0993902 Backport CI fixes to security branches
Closes GH-16469

Working towards GH-16286

commit e0db221143b808d97bc3a44e9f0968c6308794b4
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Fri Oct 25 22:48:20 2024 +0200

    Move CFLAGS into ./configure command for consistency

commit 8ad67768250d181cd7fef30e0c866625bbd8ac94
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Fri Oct 25 22:47:03 2024 +0200

    Also upgrade nightly to macOS 13

commit 58a88ccb9f
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Wed Oct 23 19:07:59 2024 +0200

    Fix call to dc[n]gettext in tests with 0 $category

    This causes a segfault on PHP-8.1

commit 611af05c50
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Fri Dec 8 13:36:52 2023 +0100

    [skip ci] Skip intermittently failing curl test on macOS

    The test fails with "CURL ERROR: 56". I will create an issue for it shortly.

commit ec745178bb
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date:   Wed Oct 23 19:05:32 2024 +0200

    Backport parts of 9999a0c for gettext

    See 9999a0cb75

commit 5ce703496f
Author: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date:   Sun Jul 28 14:34:26 2024 +0200

    Fix CI failure on macOS after Curl update

commit 714a3e7071
Author: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date:   Sat Jul 27 16:09:50 2024 +0200

    Fix CI failure after Curl update (#15124)

commit 4f2eb921b9
Author: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date:   Thu May 23 22:20:37 2024 +0200

    Fix GH-14307: Test curl_basic_024 fails with curl 8.8.0

    Curl changed the behaviour, from the changelog:
      - lib: make protocol handlers store scheme name lowercase curl/curl@c294f9c

    From the docs: "The returned scheme might be upper or lowercase. Do
    comparisons case insensitively."

    Closes GH-14312.

commit 251195b41b
Author: Ayesh Karunaratne <ayesh@aye.sh>
Date:   Thu Feb 1 02:03:55 2024 +0700

    ext/curl: Fix failing tests due to string changes in libcurl 8.6.0

    Upstream libcurl 8.6.0 contains a change[^1] that caused a test failure.
    This fixes it by updating the test's `EXPECTF` to use a regex to account for both string patterns.

    [^1]: https://github.com/curl/curl/commit/45cf4755e71f#diff-a8a54563608f8155973318f4ddb61d7328dab512b8ff2b5cc48cc76979d4204cL1683

    Closes GH-13293.

commit fc5d83f2b1
Author: Christoph M. Becker <cmbecker69@gmx.de>
Date:   Wed Oct 16 22:46:20 2024 +0200

    Prepare for necessary move to macOS 13

    GH will remove macOS 12 runner images as of December 3rd, so we prepare
    for that.

    Besides the obvious need to change the runner, we also suppress a
    couple of warnings, because otherwise the build would fail due to
    `-Werror`.
2024-10-28 15:57:16 +01:00
Ilija Tovilo
301cda932b Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Add unused asan param to configure-x64 action
2024-10-23 19:16:19 +02:00
Ilija Tovilo
9b7c506218 [skip ci] Add unused asan param to configure-x64 action
This param is passed by nightly to all branches. Add a unused argument to older
branches to avoid a warning.
2024-10-23 19:14:58 +02:00
Niels Dossche
e4010fcf95 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [ci skip] Update EXTENSIONS and CODEOWNERS for ext/soap (#16542)
2024-10-22 20:14:51 +02:00
Niels Dossche
5c210428f3 [ci skip] Update EXTENSIONS and CODEOWNERS for ext/soap (#16542)
De facto, I do the maintenance. But since many bugs are blocked by not
having reproducers and there's some fundamental issues in the extension,
this should get the "odd fixes" status instead. The "odd fixes"
description should perhaps also be updated to include a statement about
"limited willpower to debug"...
2024-10-22 20:13:59 +02:00
Christoph M. Becker
5dba6aebaa Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Download enchant dict from downloads.php.net
2024-10-17 00:55:20 +02:00
Christoph M. Becker
5ef3fe218c Download enchant dict from downloads.php.net
Since windows.php.net is in the progress to be migrated to
downloads.php.net anyway, we may as well fetch the dictionary from the
new site right away.

Closes GH-16310.
2024-10-17 00:55:04 +02:00
Saki Takamachi
8497400b23 Backport 3237b8f471
This should fix the PDO_OCI and oci8 test failures due to more verbose
output of Oracle DB 23.5.

Closes GH-16107.
2024-10-11 23:55:50 +02:00
Christoph M. Becker
80477b15cf Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Allow to run push workflows manually
2024-10-10 02:13:19 +02:00
Christoph M. Becker
509fec8ee6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Allow to run push workflows manually
2024-10-10 02:12:26 +02:00
Christoph M. Becker
0b5167cff5 [skip ci] Allow to run push workflows manually
As is, we're running the push workflow for all pushes and pull request,
plus we run more comprehensive nightly workflow for all branches which
had commits during the day.  That means that security branches may not
run CI for weeks or even months.  In the meantime, dependencies might
be updated, which can cause later workflow runs to fail.  For instance,
a few openssl tests fail due to security fixes in OpenSSL[1], an update
of Oracle Instant Client causes a couple of oci8 and pdo_oci tests to
fail[2], and the macOS builds do no longer even built (investigation
pending).

Therefore, we allow to run the pull workflow manually, so it is
possible to check the CI condition of temporary inactive branches from
time to time.

[1] <https://github.com/php/php-src/pull/16097>
[2] <https://github.com/php/php-src/pull/16107>

Closes GH-16148.
2024-10-10 02:11:59 +02:00
Christoph M. Becker
424fb2c3fc Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Install 32bit Firebird server on x86
2024-10-07 01:35:29 +02:00
Christoph M. Becker
c3434091de Install 32bit Firebird server on x86
php_pdo_firebird.dll depends on fbclient.dll, which is shipped with the
server.  However, a 64bit Firebird server ships a 64bit fbclient.dll,
which is not compatible with a 32bit php_pdo_firebird.dll.

Closes GH-16223.
2024-10-07 01:34:54 +02:00
Christoph M. Becker
d9d82377cc Update Windows CI to use php-sdk-2.3.0
php-sdk-2.2.0 still fetches dependencies from the no longer up to date
<https://windows.php.net/downloads/php-sdk/deps/>, and as such won't be
tested with any security updates we provide for Windows.  Given that
PHP 8.1 is going to receive security updates for further 15 months, we
should should not ignore these dependency updates.

Closes GH-16097.
2024-10-07 01:05:47 +02:00
Ilija Tovilo
91c06790de Switch asan build to Ubuntu 24.04
Closes GH-16065
2024-09-26 15:13:35 +02:00
Ilija Tovilo
b7ee484f2b Add missing CI services for 8.2 2024-09-25 01:20:29 +02:00
Ilija Tovilo
50d5e96edb Fix nightly for 8.2
Backport of af721c9c36
2024-09-25 00:25:01 +02:00
武田 憲太郎
af721c9c36 Fix MySQL and MSSQL CI failures
* use mysql service container for nightly tests
* remove unnecessary mysql startup
* update mssql container to newer version

Closes GH-16011.
2024-09-24 13:03:26 +02:00
Christoph M. Becker
2e5f7483db Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Adapt labeler.yml to v4 syntax
2024-09-23 14:09:46 +02:00
Christoph M. Becker
89b5cc3668 Adapt labeler.yml to v4 syntax 2024-09-23 14:08:26 +02:00
Ilija Tovilo
915d1f675b Merge branch 'PHP-8.2' into PHP-8.3 2024-09-21 20:03:35 +02:00
Ilija Tovilo
18ab97b9c2 [skip ci] Remove myself as CODEOWNER
I'm subscribed to the pulls list, so I'm just receiving each notification three
times (GitHub sends to e-mails for each PR, for some reason).
2024-09-21 20:02:19 +02:00
Christoph M. Becker
dc20cabd82 Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [ci skip] Add labels to PRs with potential ABI breaks
2024-09-21 00:11:04 +02:00
Christoph M. Becker
170230f29b [ci skip] Add labels to PRs with potential ABI breaks
ABI breaks are not supposed to happen after feature freeze, i.e. when
the PHP API numbers have been bumped.  To make it easier to notice
inadvertent ABI breaks, we automatically add an "ABI break" label to
all PRs which modify public (aka. installed) header files.  Some of
these modifications do not constitute an ABI break (e.g. adding a
comment to a header file), but we rely on natural intelligence to sort
that out.  That means these labels should be removed manually, if they
are not appropriate, but if they are, the PR should not be merged into
any stable branch.  For the master branch, where ABI breaks are
permissible, the labels should still be removed if irrelevant, but kept
when the PR is merged.

Since tests are futile[1], we leave that to further (test) PRs.

[1] <https://github.com/php/php-src/pull/15682#issuecomment-2323060586>

Closes GH-15682.
2024-09-21 00:09:30 +02:00