mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.5'
* PHP-8.5: Update clang in macOS build
This commit is contained in:
17
.github/actions/macos-update-clang/action.yml
vendored
Normal file
17
.github/actions/macos-update-clang/action.yml
vendored
Normal file
@@ -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
|
||||
2
.github/workflows/nightly.yml
vendored
2
.github/workflows/nightly.yml
vendored
@@ -363,6 +363,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
|
||||
|
||||
2
.github/workflows/push.yml
vendored
2
.github/workflows/push.yml
vendored
@@ -239,6 +239,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
|
||||
|
||||
Reference in New Issue
Block a user