Skip to content

Commit 13f0fd9

Browse files
committed
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4: Make brew verbose, limit to 10 minutes
2 parents 83056c8 + 1dfc802 commit 13f0fd9

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

.github/actions/brew/action.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,18 @@ runs:
1313
1414
# Some packages exist on x86 but not arm, or vice versa.
1515
# Install them with reinstall to avoid warnings.
16-
brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c curl
17-
brew install \
16+
brew reinstall -v \
17+
autoconf \
18+
webp \
19+
tidy-html5 \
20+
libzip \
21+
libsodium \
22+
icu4c \
23+
curl
24+
brew install -v \
1825
bison \
1926
re2c
20-
brew install \
27+
brew install -v \
2128
bzip2 \
2229
enchant \
2330
libffi \

.github/workflows/nightly.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ jobs:
360360
- name: Update clang
361361
uses: ./.github/actions/macos-update-clang
362362
- name: brew
363+
timeout-minutes: 10
363364
uses: ./.github/actions/brew
364365
- name: ./configure
365366
uses: ./.github/actions/configure-macos

.github/workflows/push.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ jobs:
242242
- name: Update clang
243243
uses: ./.github/actions/macos-update-clang
244244
- name: brew
245+
timeout-minutes: 10
245246
uses: ./.github/actions/brew
246247
- name: ccache
247248
uses: hendrikmuhs/ccache-action@v1.2

0 commit comments

Comments
 (0)