From 8a79b1c1198b91f72c4ee4bc05d64ee0ccf8c9af Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sun, 21 Apr 2024 18:52:05 +0200 Subject: [PATCH 1/6] Test --- .github/actions/configure-macos/action.yml | 2 +- .github/actions/test-macos/action.yml | 3 ++- .github/workflows/push.yml | 8 +++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index ab92dfb2d782f..0014cb8990371 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -36,7 +36,7 @@ runs: --enable-exif \ --with-zip \ --with-zlib \ - --enable-soap \ + --enable-address-sanitizer \ --enable-xmlreader \ --with-xsl \ --with-tidy="$BREW_OPT"/tidy-html5 \ diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 029ca2edb966d..881deadc2c5c6 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -29,7 +29,8 @@ runs: --offline \ --show-diff \ --show-slow 1000 \ - --set-timeout 120 + --set-timeout 120 \ + ext/phar - uses: actions/upload-artifact@v4 if: always() && inputs.testArtifacts != null with: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d07da17547310..21c2aa535671d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -43,7 +43,7 @@ env: CXX: ccache g++ jobs: LINUX_X64: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false services: mysql: image: mysql:8 @@ -156,8 +156,6 @@ jobs: include: - os: 13 arch: X64 - - os: 14 - arch: ARM64 name: MACOS_${{ matrix.arch }}_DEBUG_NTS runs-on: macos-${{ matrix.os }} steps: @@ -191,7 +189,7 @@ jobs: - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files WINDOWS: - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false name: WINDOWS_X64_ZTS runs-on: windows-2019 env: @@ -218,7 +216,7 @@ jobs: run: .github/scripts/windows/test.bat BENCHMARKING: name: BENCHMARKING - if: github.repository == 'php/php-src' || github.event_name == 'pull_request' + if: false runs-on: ubuntu-22.04 steps: - name: git checkout From 38e4cbaf8e4e4f7c3ad896ff5eb5fc174601655e Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sun, 21 Apr 2024 19:01:59 +0200 Subject: [PATCH 2/6] no-werror --- .github/actions/configure-macos/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 0014cb8990371..aa8e66eda5579 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -65,7 +65,6 @@ runs: --with-mhash \ --with-sodium \ --enable-dba \ - --enable-werror \ --with-config-file-path=/etc \ --with-config-file-scan-dir=/etc/php.d \ ${{ inputs.configurationParameters }} From 5a6d9a06558f3e82ef89c6c7a15227e95cd89937 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sun, 21 Apr 2024 19:16:04 +0200 Subject: [PATCH 3/6] Try some more --- .github/actions/configure-macos/action.yml | 8 -------- .github/actions/test-macos/action.yml | 3 +-- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index aa8e66eda5579..d2b1e42e36368 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -54,17 +54,9 @@ runs: --with-openssl \ --with-gmp="$BREW_OPT"/gmp \ --with-iconv="$BREW_OPT"/libiconv \ - --enable-bcmath \ - --enable-calendar \ - --enable-ftp \ - --enable-sysvmsg \ - --with-ffi \ --enable-zend-test \ --enable-dl-test=shared \ --enable-intl \ - --with-mhash \ - --with-sodium \ - --enable-dba \ --with-config-file-path=/etc \ --with-config-file-scan-dir=/etc/php.d \ ${{ inputs.configurationParameters }} diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 881deadc2c5c6..029ca2edb966d 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -29,8 +29,7 @@ runs: --offline \ --show-diff \ --show-slow 1000 \ - --set-timeout 120 \ - ext/phar + --set-timeout 120 - uses: actions/upload-artifact@v4 if: always() && inputs.testArtifacts != null with: From 8f1b5600b1b3f93449180ba56f0ffcceff386038 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sun, 21 Apr 2024 19:54:40 +0200 Subject: [PATCH 4/6] Try again --- .github/actions/test-macos/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 029ca2edb966d..9d1ab10fbdb21 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -29,7 +29,7 @@ runs: --offline \ --show-diff \ --show-slow 1000 \ - --set-timeout 120 + --set-timeout 120 ext/phar ext/standard - uses: actions/upload-artifact@v4 if: always() && inputs.testArtifacts != null with: From e7aa038e6861ce606c3ad6f3560141da9b9943e8 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sat, 27 Apr 2024 13:41:15 +0200 Subject: [PATCH 5/6] debug --- .github/actions/configure-macos/action.yml | 1 + .github/actions/test-macos/action.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index d2b1e42e36368..454dbef276e01 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -45,6 +45,7 @@ runs: --enable-sysvshm \ --enable-shmop \ --enable-pcntl \ + --enable-posix \ --with-readline="$BREW_OPT"/readline \ --enable-mbstring \ --with-curl \ diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 9d1ab10fbdb21..d30b82653c729 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -29,7 +29,7 @@ runs: --offline \ --show-diff \ --show-slow 1000 \ - --set-timeout 120 ext/phar ext/standard + --set-timeout 120 ext/phar ext/standard ext/posix - uses: actions/upload-artifact@v4 if: always() && inputs.testArtifacts != null with: From 6640bcf29482040cfc3fb92d388941fa7cd76173 Mon Sep 17 00:00:00 2001 From: Niels Dossche <7771979+nielsdos@users.noreply.github.com> Date: Sat, 27 Apr 2024 13:57:56 +0200 Subject: [PATCH 6/6] test --- .github/actions/test-macos/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index d30b82653c729..029ca2edb966d 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -29,7 +29,7 @@ runs: --offline \ --show-diff \ --show-slow 1000 \ - --set-timeout 120 ext/phar ext/standard ext/posix + --set-timeout 120 - uses: actions/upload-artifact@v4 if: always() && inputs.testArtifacts != null with: