Skip to content

Commit 8538ac2

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Backport CI fixes to security branches
2 parents 8f60309 + 25c0993 commit 8538ac2

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

.github/actions/configure-macos/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ runs:
2020
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
2121
./buildconf --force
2222
./configure \
23+
CFLAGS="-Wno-strict-prototypes -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion" \
2324
--enable-option-checking=fatal \
2425
--prefix=/usr/local \
2526
--enable-fpm \

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ jobs:
214214
debug: [true, false]
215215
zts: [true, false]
216216
name: "${{ matrix.branch.name }}_MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
217-
runs-on: macos-12
217+
runs-on: macos-13
218218
steps:
219219
- name: git checkout
220220
uses: actions/checkout@v4

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
-d opcache.enable_cli=1
160160
MACOS_DEBUG_NTS:
161161
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
162-
runs-on: macos-12
162+
runs-on: macos-13
163163
steps:
164164
- name: git checkout
165165
uses: actions/checkout@v4

0 commit comments

Comments
 (0)