1
0
mirror of https://github.com/php/php-src.git synced 2026-04-06 07:32:54 +02:00
Commit Graph

188 Commits

Author SHA1 Message Date
Niels Dossche
4268b0cdf8 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix Windows CI
2023-10-07 15:50:41 +02:00
Niels Dossche
ae52f1958d Fix Windows CI
The path to mysql.exe changed. Fortunately, chocolately puts the folder
containing the exe in the PATH environment variable, so we don't even
need to provide an absolute path.
2023-10-07 15:49:46 +02:00
Ilija Tovilo
af5cdd8db0 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Minimal backport of 098d9ca
2023-10-04 15:33:25 +02:00
Ilija Tovilo
36a87e6d32 Minimal backport of 098d9ca 2023-10-04 15:31:04 +02:00
Ilija Tovilo
1cf6e12a06 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Upgrade to macOS 12 in CI
2023-09-15 12:05:47 +02:00
Ilija Tovilo
55ed7690f4 Upgrade to macOS 12 in CI
We get some mysterious failures on macOS on GA with no evident error. This is a
blind attempt to solve it. There are many similar reports but there's no clear
resolution.

https://github.com/actions/runner-images/issues/7509#issuecomment-1538294874

Closes GH-12210
2023-09-15 12:04:07 +02:00
Tim Düsterhus
da13a74926 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update GitHub Action workflows to `actions/checkout@v4`
2023-09-13 22:15:40 +02:00
Tim Düsterhus
45e60e585e Update GitHub Action workflows to actions/checkout@v4
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.
2023-09-13 22:14:45 +02:00
Ilija Tovilo
b4dc85fced Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Backport GA paths-ignore changes
2023-09-04 13:58:10 +02:00
Ilija Tovilo
e3df233aca [skip ci] Backport GA paths-ignore changes 2023-09-04 13:57:48 +02:00
Ilija Tovilo
fc4c8064ba Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Skip github actions when editing other ci files
2023-09-04 13:54:15 +02:00
Ilija Tovilo
8cca0e80ef [skip ci] Skip github actions when editing other ci files 2023-09-04 13:53:58 +02:00
Ilija Tovilo
ca4d7bf5f3 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix missing instantclient in CI
2023-08-28 14:23:47 +02:00
Ilija Tovilo
f3bd027b69 Fix missing instantclient in CI
We should only pass the --with-pdo-oci and --with-oci8 flags if instantclient is
installed.

Closes GH-12066
2023-08-28 14:23:36 +02:00
Ilija Tovilo
a8e5285437 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Move installation of oracle instant client in GHA
2023-08-23 11:28:59 +02:00
Ilija Tovilo
ba07a0b846 Move installation of oracle instant client in GHA
Closes GH-12033
2023-08-23 11:28:17 +02:00
Ilija Tovilo
e11b55d219 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Use per-branch matrix for windows nightly
2023-08-14 11:40:56 +02:00
Ilija Tovilo
902d39d57c Use per-branch matrix for windows nightly
I forgot this in the last PR.
2023-08-14 11:38:59 +02:00
Ilija Tovilo
241510c454 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Remove i386 Linux from push
2023-08-10 15:59:42 +02:00
Ilija Tovilo
248e6b0404 Remove i386 Linux from push
Testing this in nightly is sufficient. 32-bit problems are rare.

Closes GH-11922
2023-08-10 15:59:17 +02:00
Ilija Tovilo
b23423528f Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Add Windows build to nightly
2023-08-10 15:56:20 +02:00
Ilija Tovilo
90f514cf21 Add Windows build to nightly
Also stop running 32-bit in push, it's really not necessary.
2023-08-10 15:56:08 +02:00
Ilija Tovilo
16c6d60067 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Don't test macOS & i386 without opcache on push
2023-08-07 12:26:45 +02:00
Ilija Tovilo
5cd0208e9f Don't test macOS & i386 without opcache on push
It should be incredibly rare for something to fail only without opcache while
also being platform specific. We're keeping opcache-less tests for x64 Linux,
macOS and i386 will continue to be tested without opcache in nightly.

Closes GH-11867
2023-08-07 12:25:24 +02:00
Ilija Tovilo
30a80b8e41 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  tests(ext-curl): fix HTTP/2 Server Push tests
2023-07-07 10:38:48 +02:00
Kévin Dunglas
47d478806a tests(ext-curl): fix HTTP/2 Server Push tests
Closes GH-10669
2023-07-07 10:38:26 +02:00
Ilija Tovilo
80153c9c2b Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Retire AppVeyor
2023-07-05 15:16:01 +02:00
Ilija Tovilo
f47dc259aa Retire AppVeyor
Closes GH-11566
2023-07-05 15:14:20 +02:00
Ilija Tovilo
463e20b510 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Attempt to improve setup-slapd.sh stability
2023-07-05 15:08:22 +02:00
Ilija Tovilo
4cc800fcb4 Attempt to improve setup-slapd.sh stability
Don't restart multiple times, restart at the end where we already have a retry
loop with a small delay.

Closes GH-11590
2023-07-05 15:07:41 +02:00
Ilija Tovilo
2086740c9e Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Don't suppress setup-slapd.sh output
2023-06-16 12:06:33 +02:00
Ilija Tovilo
1c85278fbe [skip ci] Don't suppress setup-slapd.sh output
This step frequently fails in CI. We would like to now why to see if we can
improve stability.
2023-06-16 12:04:05 +02:00
Ilija Tovilo
9f151936b7 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Upgrade libmysql version
2023-05-01 11:31:42 +02:00
Ilija Tovilo
43e267aeab [skip ci] Upgrade libmysql version 2023-05-01 11:28:33 +02:00
Ilija Tovilo
edd4980199 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Fix Slack notification
2023-04-13 13:52:42 +02:00
Ilija Tovilo
2eeff96df5 [skip ci] Fix Slack notification
ravsamhq/notify-slack-action doesn't work on MacOS, so we use curl directly.
2023-04-13 13:52:23 +02:00
Jakub Zelenka
d638c0d1e3 Merge branch 'PHP-8.1' into PHP-8.2 2023-04-11 12:48:23 +01:00
Jakub Zelenka
4be6435c9f Use curl from brew on MacOS CI
This fixes issue in curl ext SSL client cert setting test.

Closes GH-11056
2023-04-11 12:46:25 +01:00
Ilija Tovilo
aeb32bb357 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  [skip ci] Notify Slack on nightly failure
2023-04-03 17:21:34 +02:00
Ilija Tovilo
3a21a87443 [skip ci] Notify Slack on nightly failure 2023-04-03 17:21:12 +02:00
Ilija Tovilo
40ae629462 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Windows CI log verbosity, CI bat file guard
2023-03-16 00:05:21 +01:00
Michael Voříšek
f42e56286a Windows CI log verbosity, CI bat file guard
Closes GH-10817
2023-03-16 00:04:53 +01:00
Ilija Tovilo
9030a0c769 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Test Windows with opcache on GitHub actions
2023-03-09 19:21:33 +01:00
Ilija Tovilo
6b884737c4 Test Windows with opcache on GitHub actions
Fixes GH-10777
2023-03-09 19:20:02 +01:00
Ilija Tovilo
1616ae2fb6 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update libmysql 5.7 version
2023-03-08 22:18:16 +01:00
Ilija Tovilo
12290b796b Update libmysql 5.7 version 2023-03-08 22:17:48 +01:00
Ilija Tovilo
805dafddbb Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Enable GitHub actions cancel-in-progress for PRs
  mb_encode_mimeheader does not crash if provided encoding has no MIME name set
2023-03-07 11:02:00 +01:00
Ilija Tovilo
cfe1aab865 Enable GitHub actions cancel-in-progress for PRs
Pushing many commits to a pull request in a short amount of time can stall the
merge builds and also wastes energy unnecessarily. Enable concurrency to cancel
workflows of old commits in pull requests. Generate a common group name for pull
requests using github.event.pull_request.url with github.run_id as a fallback
for branches, which is unique and always available.

Closes GH-10799
2023-03-07 11:00:35 +01:00
Ilija Tovilo
256d23ca26 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Update windows action to checkout@v3
2023-03-05 17:50:40 +01:00
Ilija Tovilo
28ef654648 Update windows action to checkout@v3 2023-03-05 17:50:22 +01:00