Commit Graph

365 Commits

Author SHA1 Message Date
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
Christoph M. Becker
ad11cbc491
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Run snmp tests in Windows CI, again
2024-09-15 23:14:15 +02:00
Christoph M. Becker
b26e610777
Run snmp tests in Windows CI, again
That was broken when CI was moved to GH, since `APPVEYOR_BUILD_FOLDER`
is no longer set; instead we use `GITHUB_WORKSPACE` which has the same
meaning.

Closes GH-15896.
2024-09-15 23:13:54 +02:00
Ilija Tovilo
a08d326941
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix GA macOS brew warnings
2024-09-13 23:10:19 +02:00
Ilija Tovilo
664e039069
Fix GA macOS brew warnings
These pollute the job overview.

Closes GH-15877
2024-09-13 23:10:08 +02:00
Ilija Tovilo
d7febabd23
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Backport libmysql build fix (d9a9696)
2024-09-02 12:09:36 +02:00
Ilija Tovilo
57f9041165
[skip ci] Backport libmysql build fix (d9a9696) 2024-09-02 12:08:55 +02:00
Ilija Tovilo
cbe73a158f
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Fix git check in verify generated files (GH-15363)
2024-08-12 16:20:24 +02:00
Ilija Tovilo
9be52dcd62
Fix git check in verify generated files (GH-15363)
Git 2.46.0 accidentally broke git diff --exit-code for files flagged with -diff.
Add the -a flag to restore the previous behavior. This issue is already fixed in
gits next branch.
2024-08-12 16:19:54 +02:00
Tim Düsterhus
6291cab8da
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Update ci actions/checkout to v4 (#15283)
2024-08-08 09:57:53 +02:00
disservin
9bfe36508d
Update ci actions/checkout to v4 (#15283)
see 45e60e585e
see 69dbfadd1e
2024-08-08 09:57:31 +02:00
Peter Kokot
9cd0484de0
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Sync CODEOWNERS (#15017)
2024-07-29 00:12:31 +02:00
Peter Kokot
d214a359c9
[skip ci] Sync CODEOWNERS (#15017)
This repeats the sync as noted in the GH-13591 and the discussion
https://news-web.php.net/php.internals/124472

The CODEOWNERS file is related to the targeted branch in the pull
request and not only the master branch.

- Added a note to change the earliest supported PHP branch and not only
  master branch
- Synced GitHub ID's and paths across the PHP-8.2, PHP-8.3 and master
  branches
- Add note how changes here should be analogous to bug fixes
  with a link to CONTRIBUTING.md which describes which branch to
  target
2024-07-29 00:11:48 +02:00
Christoph M. Becker
94172b05d0
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Update the php-sdk-binary-tools to php-sdk-2.3.0
2024-07-19 12:18:26 +02:00
Christoph M. Becker
93a9a9b4a4
Update the php-sdk-binary-tools to php-sdk-2.3.0
The Windows CI of the `PHP-8.2` to `PHP-8.3` branches still use the
`php-sdk-2.2.0` which is almost five years old, and does not fetch the
updated dependencies from https://downloads.php.net/~windows.

The `master` branch CI uses `php_downloads_server_migration_v1`, which
has been superseded a few months ago[1].  So switching to the
`php-sdk-2.3.0` makes sense there, too.

[1] <php/php-sdk-binary-tools@19c8ccb>

Closes GH-14991.
2024-07-19 12:17:39 +02:00
Ilija Tovilo
6361b39e81
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Fix exlusion of buggy Symfony test
2024-07-04 15:44:22 +02:00
Ilija Tovilo
a380cdb996
[skip ci] Fix exlusion of buggy Symfony test 2024-07-04 15:44:09 +02:00
Ilija Tovilo
9cec164f76
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Remove GitHub actions junit artifacts
2024-06-13 14:07:43 +02:00
Ilija Tovilo
f598b58790
Remove GitHub actions junit artifacts
Nobody looks at those, and nightly regularly fails due to uploading them.

Closes GH-14555
2024-06-13 14:05:50 +02:00
Ilija Tovilo
3250457242
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Attempt to fix mysql_native_password error for 32-bit build
2024-05-29 12:49:43 +02:00
Ilija Tovilo
a05301e783
Attempt to fix mysql_native_password error for 32-bit build
Closes GH-14356
2024-05-29 12:48:47 +02:00
Ilija Tovilo
9f77c1f995
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  Re-add 32-bit push build
2024-05-29 11:49:49 +02:00
Ilija Tovilo
69dbfadd1e
Re-add 32-bit push build
32-bit fails more commonly that I had assumed.

Closes GH-14300
2024-05-29 11:47:24 +02:00
Ilija Tovilo
ad155179fe
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Adjust CODEOWNERS
2024-05-22 13:17:07 +02:00
Ilija Tovilo
151f56b376
[skip ci] Adjust CODEOWNERS
Reduce e-mails, I'm watching this repository anyway.
2024-05-22 13:16:04 +02:00
Tim Düsterhus
402f3a923f
CI: Do not save the ccache for PRs (8.3+)
see GH-14168
2024-05-07 20:53:33 +02:00
Tim Düsterhus
1bf42b4eb4
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  CI: Do not save the ccache for PRs (#14168)
2024-05-07 20:52:25 +02:00
Tim Düsterhus
b8aa68bc09
CI: Do not save the ccache for PRs (#14168)
Resolves #14155
2024-05-07 20:52:10 +02:00
Saki Takamachi
cd2dea77ff
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  CI: fix oci setup (#14123)
2024-05-04 17:47:55 +09:00
Saki Takamachi
3237b8f471
CI: fix oci setup (#14123)
closes #14123
2024-05-04 17:47:27 +09:00
武田 憲太郎
febbbfac78
Fix the MySQL Server version used for testing to (#14120)
closes #14120
2024-05-04 07:49:07 +09:00
Ilija Tovilo
2f64d07337
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2:
  [skip ci] Backport 0e7ef95 and 4f0d4c0
2024-04-21 16:13:21 +02:00
Ilija Tovilo
891e4a5a34
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Backport 0e7ef95 and 4f0d4c0
2024-04-21 16:12:18 +02:00
Ilija Tovilo
469ad32581
[skip ci] Backport 0e7ef95 and 4f0d4c0 2024-04-21 16:11:55 +02:00
Bob Weinand
dbaeb62ab1 Merge branch 'PHP-8.2' of github.com:php/php-src into PHP-8.3 2024-04-02 18:11:55 +02:00