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

86 Commits

Author SHA1 Message Date
Christoph M. Becker
5a55ef021c 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:01:02 +01:00
Christoph M. Becker
15cc4424bb 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:00:47 +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
e3de1a1a21 Fix icu dependency for macos build
Closes GH-16627
2024-10-28 16:40:51 +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
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
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
Ilija Tovilo
50d5e96edb Fix nightly for 8.2
Backport of af721c9c36
2024-09-25 00:25:01 +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
57f9041165 [skip ci] Backport libmysql build fix (d9a9696) 2024-09-02 12:08:55 +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
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
Saki Takamachi
3237b8f471 CI: fix oci setup (#14123)
closes #14123
2024-05-04 17:47:27 +09:00
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
Saki Takamachi
99688dbe7a Removed REPORT_EXIT_STATUS=no in libmysql tests 2024-02-29 08:41:36 +09:00
Jakub Zelenka
3d4b36fc9c CI: Continue on error if Caddy download fails
Closes GH-13542
2024-02-27 22:03:04 +00: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
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
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
Ilija Tovilo
90c9ec14eb Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Fix JIT on nightly
2023-10-13 11:42:55 +02:00
Ilija Tovilo
734afa0ba8 Fix JIT on nightly
The JIT was accidentally disabled in nightly on lower branches because
jit_buffer_size woudln't be passed from nightly.yml on master anymore.
2023-10-13 11:41:52 +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
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
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
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
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
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
c891495e04 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Re-enable UnixODBC testing.
2023-02-23 23:14:34 +01:00
Danack
939c546ea1 Re-enable UnixODBC testing.
The problem installing the package in the CI environment has been fixed.
2023-02-23 23:14:02 +01:00
Ilija Tovilo
0d56a5b591 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Temporarily disable odbc in ci
2023-02-11 13:35:35 +01:00
Ilija Tovilo
18b611d6a0 Temporarily disable odbc in ci
The unixodbc.h header is suddenly missing.
2023-02-11 13:22:27 +01:00
Ilija Tovilo
b08901b63f Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Migrate i386 to GitHub actions
2022-11-03 14:37:59 +01:00
Ilija Tovilo
ed1e703716 Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0:
  Migrate i386 to GitHub actions
2022-11-03 14:37:17 +01:00
Ilija Tovilo
75970077b0 Migrate i386 to GitHub actions
Closes GH-9856
2022-11-03 14:34:54 +01:00
Ilija Tovilo
182c8acf43 Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1:
  Prepare for Windows CI with Github Actions
2022-10-09 18:48:07 +02:00