php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
134,648 Commits 545 Branches 1,479 Tags
1663ed6c6e5498dd8d26325840bdbdb7f212c76f
Commit Graph

345 Commits

Author SHA1 Message Date
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
Bob Weinand
e7462bff19 Run one testsuite with observers enabled in CI (#13869) 
Signed-off-by: Bob Weinand <bobwei9@hotmail.com>
 2024-04-02 18:11:02 +02:00
Ilija Tovilo
697d1a1c63 Fix ASan build 
See https://github.com/actions/runner-images/issues/9491#issuecomment-1989718917

The mentioned workaround doesn't work for us because we run ASan inside Docker.
Instead, we switch to ubuntu-20.04 as the host. The docker setup itself remains
the same.

Closes GH-13757
 2024-03-19 17:15:36 +01:00
Shivam Mathur
59e8c267fa Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
    Fix brew action (#13659)
    We patch brew to ensure it overwrites files while linking the dependencies
 2024-03-10 20:18:47 +05:30
Shivam Mathur
0e05f26be6 Fix brew action (#13659) 
We patch brew to ensure it overwrites files while linking the dependencies
 2024-03-10 20:11:24 +05:30
Peter Kokot
72197e36b8 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Add CODEOWNERS in PHP-8.2 branch
 2024-03-09 01:28:55 +01:00
Peter Kokot
a284c3e873 [skip ci] Add CODEOWNERS in PHP-8.2 branch 
GitHub at the time of this writing, requires CODEOWNERS file to be
present in each branch for the pull request reviews. This adds adjusted
CODEOWNERS file from current master branch with updated requests and
changes in PHP-8.3 branch.

Closes GH-13623
 2024-03-09 01:27:54 +01:00
Peter Kokot
88e90c6f83 Move CODEOWNERS to .github (#13591) 
The CODEOWNERS file is specific to GitHub interface and can be located
in .github, docs or in project root. It makes the php-src root directory
a bit more browseable.
 2024-03-07 22:44:31 +01:00
Saki Takamachi
116166cd30 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Removed `REPORT_EXIT_STATUS=no` in libmysql tests
 2024-02-29 08:49:04 +09:00
Saki Takamachi
99688dbe7a Removed REPORT_EXIT_STATUS=no in libmysql tests 2024-02-29 08:41:36 +09:00
Jakub Zelenka
4dc8c08acd Merge branch 'PHP-8.2' into PHP-8.3 2024-02-27 22:04:05 +00:00
Jakub Zelenka
3d4b36fc9c CI: Continue on error if Caddy download fails 
Closes GH-13542
 2024-02-27 22:03:04 +00:00
Ilija Tovilo
3d2f9883ba Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  [skip ci] Fix paths-ignore glob pattern
 2024-02-18 20:38:11 +01:00
Ilija Tovilo
a18cf333ba [skip ci] Fix paths-ignore glob pattern 
* does not work for nested files.
 2024-02-18 20:37:26 +01:00
Tim Düsterhus
26153eec02 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  ci: update caddy job to use GitHub Releases
 2024-02-01 00:12:22 +01:00
Tim Düsterhus
95c5c407ee Merge branch 'PHP-8.1' into PHP-8.2 
* PHP-8.1:
  ci: update caddy job to use GitHub Releases
 2024-02-01 00:12:13 +01:00
Ayesh Karunaratne
4922b9eb7d ci: update caddy job to use GitHub Releases 
The caddyserver.com download page is unreliable, and it also recommends to use GitHub releases instead.

Closes #13296
 2024-02-01 00:11:54 +01:00
Tim Düsterhus
b82d25b7b6 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Update GitHub Action workflows to `actions/upload-artifact@v4` (#13297)
 2024-01-31 23:34:50 +01:00
Tim Düsterhus
e209506bfa Update GitHub Action workflows to actions/upload-artifact@v4 (#13297) 
Keep this up to date in all non-security-only branches, because the node.js
runtime for older versions might get deprecated in the future and fixing this
for all branches at once is easier.
 2024-01-31 23:34:28 +01:00
Ilija Tovilo
de0cef4a09 Merge branch 'PHP-8.2' into PHP-8.3 
* PHP-8.2:
  Reduce parallelism on frequently crashing jobs
 2023-11-28 00:31:14 +01:00
Ilija Tovilo
ace91ddd73 Reduce parallelism on frequently crashing jobs 
Some jobs on GA apparently consume a lot of CPU resources, possibly hindering
communication between master and runner. This only seems to happen on Linux+ASAN
and macOS. For these jobs, keep one core idle.

Closes GH-12742
 2023-11-28 00:27:24 +01:00