Commit cb413b5d5f9 for php.net
commit cb413b5d5f96ad97a8cc2d4f0ad0b065051f122f
Author: Ilija Tovilo <ilija.tovilo@me.com>
Date: Thu Dec 4 14:31:29 2025 +0100
Update clang in macOS build
This resolves a crash in release builds. This may be dropped again in the
future once the bugfix lands.
Co-authored by Alexandre Daubois <alex.daubois@gmail.com>
Co-authored by Arnaud Le Blanc <arnaud.lb@gmail.com>
Co-authored by Jakub Zelenka <bukka@php.net>
Closes GH-20669
diff --git a/.github/actions/macos-update-clang/action.yml b/.github/actions/macos-update-clang/action.yml
new file mode 100644
index 00000000000..bceb431aed5
--- /dev/null
+++ b/.github/actions/macos-update-clang/action.yml
@@ -0,0 +1,17 @@
+name: Update clang
+runs:
+ using: composite
+ steps:
+ - shell: bash
+ run: |
+ softwareupdate -l
+ label=$((softwareupdate -l 2>/dev/null | grep 'Label:' | grep -o 'Command Line Tools for Xcode.*' | head -1) || echo '')
+ if [ -n "$label" ]; then
+ softwareupdate -i "$label"
+ xcode_path=$(ls -1 '/Applications' | grep 'Xcode_.*\.app' | head -1)
+ sudo xcode-select -s "/Applications/$xcode_path"
+ else
+ echo "Not found."
+ fi
+ which clang
+ clang -v
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 909a412e796..e67deb8ffe4 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -367,6 +367,8 @@ jobs:
uses: actions/checkout@v5
with:
ref: ${{ inputs.branch }}
+ - name: Update clang
+ uses: ./.github/actions/macos-update-clang
- name: brew
uses: ./.github/actions/brew
- name: ./configure
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 028255330d1..054f4a15286 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -117,6 +117,8 @@ jobs:
steps:
- name: git checkout
uses: actions/checkout@v5
+ - name: Update clang
+ uses: ./.github/actions/macos-update-clang
- name: brew
uses: ./.github/actions/brew
- name: ccache