Skip to content

Commit b8e1cc9

Browse files
committed
Prepare for necessary move to macOS 13
GH will remove macOS 12 runner images as of December 3rd, so we prepare for that. Besides the obvious need to change the runner, we also suppress a couple of warnings, because otherwise the build would fail due to `-Werror`.
1 parent 2c40762 commit b8e1cc9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig"
2020
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
2121
./buildconf --force
22-
./configure \
22+
CFLAGS='-Wno-strict-prototypes -Wno-unused-but-set-variable -Wno-single-bit-bitfield-constant-conversion' ./configure \
2323
--enable-option-checking=fatal \
2424
--prefix=/usr/local \
2525
--enable-fpm \

.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
uses: ./.github/actions/verify-generated-files
9898
MACOS_DEBUG_NTS:
9999
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
100-
runs-on: macos-12
100+
runs-on: macos-13
101101
steps:
102102
- name: git checkout
103103
uses: actions/checkout@v4

ext/openssl/openssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ static int X509_get_signature_nid(const X509 *x)
448448
PHP_OPENSSL_CHECK_NUMBER_CONVERSION_NULL_RETURN(ZEND_LONG_EXCEEDS_INT(_var), _name)
449449

450450
/* {{{ php_openssl_store_errors */
451-
void php_openssl_store_errors()
451+
void php_openssl_store_errors(void)
452452
{
453453
struct php_openssl_errors *errors;
454454
int error_code = ERR_get_error();

0 commit comments

Comments
 (0)