Skip to content

Commit 14ea97a

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Update clang in macOS build
2 parents 5da5fa5 + 4969ef1 commit 14ea97a

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Update clang
2+
runs:
3+
using: composite
4+
steps:
5+
- shell: bash
6+
run: |
7+
softwareupdate -l
8+
label=$((softwareupdate -l 2>/dev/null | grep 'Label:' | grep -o 'Command Line Tools for Xcode.*' | head -1) || echo '')
9+
if [ -n "$label" ]; then
10+
softwareupdate -i "$label"
11+
xcode_path=$(ls -1 '/Applications' | grep 'Xcode_.*\.app' | head -1)
12+
sudo xcode-select -s "/Applications/$xcode_path"
13+
else
14+
echo "Not found."
15+
fi
16+
which clang
17+
clang -v

.github/workflows/nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,8 @@ jobs:
367367
uses: actions/checkout@v5
368368
with:
369369
ref: ${{ inputs.branch }}
370+
- name: Update clang
371+
uses: ./.github/actions/macos-update-clang
370372
- name: brew
371373
uses: ./.github/actions/brew
372374
- name: ./configure

.github/workflows/push.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ jobs:
235235
steps:
236236
- name: git checkout
237237
uses: actions/checkout@v5
238+
- name: Update clang
239+
uses: ./.github/actions/macos-update-clang
238240
- name: brew
239241
uses: ./.github/actions/brew
240242
- name: ccache

0 commit comments

Comments
 (0)