Skip to content

Commit 3aa672d

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Backport CI fixes to security branches
2 parents d9947e8 + 8538ac2 commit 3aa672d

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
@@ -238,7 +238,7 @@ jobs:
238238
debug: [true, false]
239239
zts: [true, false]
240240
name: "${{ matrix.branch.name }}_MACOS_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
241-
runs-on: macos-12
241+
runs-on: macos-13
242242
steps:
243243
- name: git checkout
244244
uses: actions/checkout@v4

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ jobs:
181181
-d opcache.enable_cli=1
182182
MACOS_DEBUG_NTS:
183183
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
184-
runs-on: macos-12
184+
runs-on: macos-13
185185
steps:
186186
- name: git checkout
187187
uses: actions/checkout@v4

0 commit comments

Comments
 (0)