Skip to content

Commit 1dfc802

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Make brew verbose, limit to 10 minutes
2 parents de26827 + 47fbaca commit 1dfc802

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

.github/actions/brew/action.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,17 @@ 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
17-
brew install \
16+
brew reinstall -v \
17+
autoconf \
18+
webp \
19+
tidy-html5 \
20+
libzip \
21+
libsodium \
22+
icu4c
23+
brew install -v \
1824
bison \
1925
re2c
20-
brew install \
26+
brew install -v \
2127
bzip2 \
2228
enchant \
2329
libffi \

.github/workflows/nightly.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ jobs:
367367
- name: Update clang
368368
uses: ./.github/actions/macos-update-clang
369369
- name: brew
370+
timeout-minutes: 10
370371
uses: ./.github/actions/brew
371372
- name: ./configure
372373
uses: ./.github/actions/configure-macos

.github/workflows/push.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ jobs:
238238
- name: Update clang
239239
uses: ./.github/actions/macos-update-clang
240240
- name: brew
241+
timeout-minutes: 10
241242
uses: ./.github/actions/brew
242243
- name: ccache
243244
uses: hendrikmuhs/ccache-action@v1.2

0 commit comments

Comments
 (0)