Run MACOS ZTS tests on push

Author: dstogov

.github/workflows/push.yml

@@ -41,117 +41,69 @@ env:
   CC: ccache gcc
   CXX: ccache g++
 jobs:
-  LINUX_X64:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - debug: true
-            zts: false
-          - debug: false
-            zts: true
-    name: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
-    runs-on: ubuntu-20.04
+  MACOS_ARM64_DEBUG_ZTS:
+    runs-on: macos-12
     steps:
       - name: git checkout
         uses: actions/checkout@v4
-      - name: Create MSSQL container
-        uses: ./.github/actions/setup-mssql
-      - name: Create Oracle container
-        uses: ./.github/actions/setup-oracle
-      - name: Setup Caddy server
-        uses: ./.github/actions/setup-caddy
-      - name: apt
-        uses: ./.github/actions/apt-x64
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          # This duplicates the "job.name" expression above because
-          # GitHub has no way to query the job name (github.job is the
-          # job id, not the job name)
-          key: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}-${{hashFiles('main/php_version.h')}}"
-          append-timestamp: false
+      - name: brew
+        uses: ./.github/actions/brew
       - name: ./configure
-        uses: ./.github/actions/configure-x64
+        uses: ./.github/actions/configure-macos
         with:
-          configurationParameters: >-
-            --${{ matrix.debug && 'enable' || 'disable' }}-debug
-            --${{ matrix.zts && 'enable' || 'disable' }}-zts
+          configurationParameters: --enable-debug --enable-zts
       - name: make
-        run: make -j$(/usr/bin/nproc) >/dev/null
+        run: |-
+          export PATH="/usr/local/opt/bison/bin:$PATH"
+          make -j$(sysctl -n hw.logicalcpu) >/dev/null
       - name: make install
-        uses: ./.github/actions/install-linux
-      - name: Setup
-        uses: ./.github/actions/setup-x64
-      - name: Test
-        uses: ./.github/actions/test-linux
-        with:
-          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
+        run: sudo make install
       - name: Test Tracing JIT
-        uses: ./.github/actions/test-linux
-        with:
-          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
-          jitType: tracing
-          runTestsParameters: >-
-            -d zend_extension=opcache.so
-            -d opcache.enable_cli=1
-      - name: Verify generated files are up to date
-        uses: ./.github/actions/verify-generated-files
-  MACOS_DEBUG_NTS:
-    runs-on: macos-12
+        run: |
+          set -x
+          export SKIP_IO_CAPTURE_TESTS=1
+          export CI_NO_IPV6=1
+          export TEST_PHP_JUNIT=junit.out.xml
+          sapi/cli/php run-tests.php -P -q \
+            -d opcache.jit=tracing \
+            -d opcache.jit_buffer_size=16M \
+            -j$(($(sysctl -n hw.ncpu) - 1)) \
+            -g FAIL,BORK,LEAK,XLEAK \
+            --no-progress \
+            --offline \
+            --show-diff \
+            --show-slow 1000 \
+            --set-timeout 120
+  MACOS_X64_DEBUG_ZTS:
+    runs-on: macos-11
     steps:
       - name: git checkout
         uses: actions/checkout@v4
       - name: brew
         uses: ./.github/actions/brew
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
-          append-timestamp: false
       - name: ./configure
         uses: ./.github/actions/configure-macos
         with:
-          configurationParameters: --enable-debug --disable-zts
+          configurationParameters: --enable-debug --enable-zts
       - name: make
         run: |-
           export PATH="/usr/local/opt/bison/bin:$PATH"
           make -j$(sysctl -n hw.logicalcpu) >/dev/null
       - name: make install
         run: sudo make install
       - name: Test Tracing JIT
-        uses: ./.github/actions/test-macos
-        with:
-          testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
-          jitType: tracing
-          runTestsParameters: >-
-            -d zend_extension=opcache.so
-            -d opcache.enable_cli=1
-            -d opcache.protect_memory=1
-      - name: Verify generated files are up to date
-        uses: ./.github/actions/verify-generated-files
-  WINDOWS:
-    name: WINDOWS_X64_ZTS
-    runs-on: windows-2019
-    env:
-      PHP_BUILD_CACHE_BASE_DIR: C:\build-cache
-      PHP_BUILD_OBJ_DIR: C:\obj
-      PHP_BUILD_CACHE_SDK_DIR: C:\build-cache\sdk
-      PHP_BUILD_SDK_BRANCH: php-sdk-2.2.0
-      PHP_BUILD_CRT: vs16
-      PLATFORM: x64
-      THREAD_SAFE: "1"
-      INTRINSICS: AVX2
-      PARALLEL: -j2
-      OPCACHE: "1"
-    steps:
-      - name: git config
-        run: git config --global core.autocrlf false && git config --global core.eol lf
-      - name: git checkout
-        uses: actions/checkout@v4
-      - name: Setup
-        uses: ./.github/actions/setup-windows
-      - name: Build
-        run: .github/scripts/windows/build.bat
-      - name: Test
-        run: .github/scripts/windows/test.bat
+        run: |
+          set -x
+          export SKIP_IO_CAPTURE_TESTS=1
+          export CI_NO_IPV6=1
+          export TEST_PHP_JUNIT=junit.out.xml
+          sapi/cli/php run-tests.php -P -q \
+            -d opcache.jit=tracing \
+            -d opcache.jit_buffer_size=16M \
+            -j$(($(sysctl -n hw.ncpu) - 1)) \
+            -g FAIL,BORK,LEAK,XLEAK \
+            --no-progress \
+            --offline \
+            --show-diff \
+            --show-slow 1000 \
+            --set-timeout 120