From 734afa0ba8169b74a85326575323f0afbd1cf7ef Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Fri, 13 Oct 2023 11:41:52 +0200 Subject: [PATCH] Fix JIT on nightly The JIT was accidentally disabled in nightly on lower branches because jit_buffer_size woudln't be passed from nightly.yml on master anymore. --- .github/actions/test-linux/action.yml | 1 + .github/actions/test-macos/action.yml | 1 + .github/workflows/nightly.yml | 6 ------ .github/workflows/push.yml | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml index 7d66d223520..1dfba394787 100644 --- a/.github/actions/test-linux/action.yml +++ b/.github/actions/test-linux/action.yml @@ -31,6 +31,7 @@ runs: export SKIP_IO_CAPTURE_TESTS=1 sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -d opcache.jit=${{ inputs.jitType }} \ + -d opcache.jit_buffer_size=16M \ -j$(/usr/bin/nproc) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ --offline \ diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 6036ce1e5a9..3bf0fdb7097 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -16,6 +16,7 @@ runs: export CI_NO_IPV6=1 sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -d opcache.jit=${{ inputs.jitType }} \ + -d opcache.jit_buffer_size=16M \ -j$(sysctl -n hw.ncpu) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ --offline \ diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 7283f10672d..ae6877c4022 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -89,7 +89,6 @@ jobs: ${{ matrix.run_tests_parameters }} -d zend_extension=opcache.so -d opcache.enable_cli=1 - -d opcache.jit_buffer_size=16M - name: Test OpCache uses: ./.github/actions/test-linux with: @@ -108,7 +107,6 @@ jobs: ${{ matrix.run_tests_parameters }} -d zend_extension=opcache.so -d opcache.enable_cli=1 - -d opcache.jit_buffer_size=16M - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files - name: Notify Slack @@ -171,7 +169,6 @@ jobs: ${{ matrix.run_tests_parameters }} -d zend_extension=opcache.so -d opcache.enable_cli=1 - -d opcache.jit_buffer_size=16M - name: Test OpCache uses: ./.github/actions/test-linux with: @@ -187,7 +184,6 @@ jobs: ${{ matrix.run_tests_parameters }} -d zend_extension=opcache.so -d opcache.enable_cli=1 - -d opcache.jit_buffer_size=16M - name: Notify Slack if: failure() uses: ./.github/actions/notify-slack @@ -233,7 +229,6 @@ jobs: -d zend_extension=opcache.so -d opcache.enable_cli=1 -d opcache.protect_memory=1 - -d opcache.jit_buffer_size=16M - name: Test OpCache uses: ./.github/actions/test-macos with: @@ -249,7 +244,6 @@ jobs: -d zend_extension=opcache.so -d opcache.enable_cli=1 -d opcache.protect_memory=1 - -d opcache.jit_buffer_size=16M - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files - name: Notify Slack diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 3cd2fbad0f7..52f70f809e9 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -91,7 +91,6 @@ jobs: runTestsParameters: >- -d zend_extension=opcache.so -d opcache.enable_cli=1 - -d opcache.jit_buffer_size=16M - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files MACOS_DEBUG_NTS: @@ -124,7 +123,6 @@ jobs: -d zend_extension=opcache.so -d opcache.enable_cli=1 -d opcache.protect_memory=1 - -d opcache.jit_buffer_size=16M - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files WINDOWS: