From c8ca933185d8b7d6a6c7f32d15c7a61b1743ac8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Tue, 12 Apr 2022 14:37:00 +0200
Subject: [PATCH] Fix opcache testing in CI

---
 .github/actions/install-linux/action.yml |  2 --
 .github/workflows/nightly.yml            | 18 ++++++++++++------
 .github/workflows/push.yml               |  7 ++++++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/actions/install-linux/action.yml b/.github/actions/install-linux/action.yml
index 6db48f0ec3e1d..e0f6726dbd1d3 100644
--- a/.github/actions/install-linux/action.yml
+++ b/.github/actions/install-linux/action.yml
@@ -10,5 +10,3 @@ runs:
         sudo chmod 777 /etc/php.d
         echo mysqli.default_socket=/var/run/mysqld/mysqld.sock    > /etc/php.d/mysqli.ini
         echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
-        echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
-        echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 1b847554afe9a..4c881ada54562 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -68,25 +68,28 @@ jobs:
         with:
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
-      - name: Test Tracing JIT
+      - name: Test OpCache
         uses: ./.github/actions/test-linux
         with:
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
-            -d opcache.jit_buffer_size=16M
-      - name: Test OpCache
+            -d opcache.enable_cli=1
+      - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
+            -d opcache.jit_buffer_size=16M
       - name: Test Function JIT
         uses: ./.github/actions/test-linux
         with:
           runTestsParameters: >-
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
             -d opcache.jit_buffer_size=16M
             -d opcache.jit=1205
   MACOS:
@@ -121,24 +124,27 @@ jobs:
         run: sudo make install
       - name: Test
         uses: ./.github/actions/test-macos
-      - name: Test Tracing JIT
+      - name: Test OpCache
         uses: ./.github/actions/test-macos
         with:
           runTestsParameters: >-
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
             -d opcache.protect_memory=1
-            -d opcache.jit_buffer_size=16M
-      - name: Test OpCache
+      - name: Test Tracing JIT
         uses: ./.github/actions/test-macos
         with:
           runTestsParameters: >-
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
             -d opcache.protect_memory=1
+            -d opcache.jit_buffer_size=16M
       - name: Test Function JIT
         uses: ./.github/actions/test-macos
         with:
           runTestsParameters: >-
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
             -d opcache.protect_memory=1
             -d opcache.jit_buffer_size=16M
             -d opcache.jit=1205
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 7e348802b1e6e..7c33311f19034 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -14,6 +14,7 @@ on:
       - PHP-8.0
       - PHP-8.1
       - master
+      - '**.cipush'
   pull_request:
     branches:
       - '**'
@@ -53,7 +54,10 @@ jobs:
       - name: Test Tracing JIT
         uses: ./.github/actions/test-linux
         with:
-          runTestsParameters: -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M
+          runTestsParameters: >-
+            -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
+            -d opcache.jit_buffer_size=16M
   MACOS_DEBUG_NTS:
     runs-on: macos-10.15
     steps:
@@ -78,5 +82,6 @@ jobs:
         with:
           runTestsParameters: >-
             -d zend_extension=opcache.so
+            -d opcache.enable_cli=1
             -d opcache.protect_memory=1
             -d opcache.jit_buffer_size=16M