Skip to content

Commit 6344b47

Browse files
committed
wip
1 parent b702023 commit 6344b47

File tree

6 files changed

+135
-242
lines changed

6 files changed

+135
-242
lines changed

.github/actions/linux-x64/action.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Linux x64
2+
inputs:
3+
configurationParameters:
4+
required: true
5+
extendedTests:
6+
required: true
7+
runs:
8+
using: composite
9+
steps:
10+
- name: git checkout
11+
uses: actions/checkout@v2
12+
- name: Create mssql container
13+
uses: ./.github/actions/mssql
14+
- name: apt
15+
uses: ./.github/actions/apt-x64
16+
- name: ./configure
17+
uses: ./.github/actions/configure-x64
18+
with:
19+
configurationParameters: ${{ inputs.configurationParameters }}
20+
- name: make
21+
shell: bash
22+
run: make -j$(/usr/bin/nproc) >/dev/null
23+
- name: make install
24+
uses: ./.github/actions/install-linux
25+
- name: Setup
26+
uses: ./.github/actions/setup-x64
27+
- name: Test
28+
uses: ./.github/actions/tests-linux
29+
with:
30+
extended: ${{ inputs.extendedTests }}

.github/actions/macos/action.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: macos
2+
inputs:
3+
configurationParameters:
4+
required: true
5+
extendedTests:
6+
required: true
7+
runs:
8+
using: composite
9+
steps:
10+
- name: git checkout
11+
uses: actions/checkout@v2
12+
- name: brew
13+
uses: ./.github/actions/brew
14+
- name: ./configure
15+
uses: ./.github/actions/configure-macos
16+
with:
17+
configurationParameters: ${{ inputs.configurationParameters }}
18+
- name: make
19+
shell: bash
20+
run: |
21+
export PATH="/usr/local/opt/bison/bin:$PATH"
22+
make -j$(sysctl -n hw.logicalcpu) >/dev/null
23+
- name: make
24+
shell: bash
25+
run: sudo make install
26+
- name: Setup
27+
uses: ./.github/actions/setup-x64
28+
- name: Test
29+
uses: ./.github/actions/tests-linux
30+
with:
31+
extended: ${{ inputs.extendedTests }}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Tests Linux
2+
inputs:
3+
extended:
4+
required: true
5+
runTestsParameters:
6+
default: ''
7+
required: false
8+
runs:
9+
using: composite
10+
steps:
11+
- uses: ./.github/actions/linux-test
12+
with:
13+
runTestsParameters: ${{ inputs.runTestsParameters }}
14+
- name: Tracing JIT
15+
uses: ./.github/actions/linux-test
16+
with:
17+
runTestsParameters: '${{ inputs.runTestsParameters }} -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M'
18+
- name: OpCache
19+
if: ${{ inputs.extended }}
20+
uses: ./.github/actions/linux-test
21+
with:
22+
runTestsParameters: '${{ inputs.runTestsParameters }} -d zend_extension=opcache.so'
23+
- name: Function JIT
24+
if: ${{ inputs.extended }}
25+
uses: ./.github/actions/linux-test
26+
with:
27+
runTestsParameters: '${{ inputs.runTestsParameters }} -d zend_extension=opcache.so -d opcache.jit_buffer_size=16M -d opcache.jit=1205'
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Tests macos
2+
inputs:
3+
extended:
4+
required: true
5+
runTestsParameters:
6+
default: ''
7+
required: false
8+
runs:
9+
using: composite
10+
steps:
11+
- uses: ./.github/actions/macos-test
12+
with:
13+
runTestsParameters: ${{ inputs.runTestsParameters }}
14+
- name: Tracing JIT
15+
uses: ./.github/actions/macos-test
16+
with:
17+
runTestsParameters: '${{ inputs.runTestsParameters }} -d zend_extension=opcache.so -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M'
18+
- name: OpCache
19+
if: ${{ inputs.extended }}
20+
uses: ./.github/actions/macos-test
21+
with:
22+
runTestsParameters: '${{ inputs.runTestsParameters }} -d zend_extension=opcache.so -d opcache.protect_memory=1'
23+
- name: Function JIT
24+
if: ${{ inputs.extended }}
25+
uses: ./.github/actions/macos-test
26+
with:
27+
runTestsParameters: '${{ inputs.runTestsParameters }} -d zend_extension=opcache.so -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d opcache.jit=1205'

.github/matrix.php

Lines changed: 0 additions & 229 deletions
This file was deleted.

.github/workflows/push.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,28 @@ on:
1010
- CONTRIBUTING.md
1111
- CODING_STANDARDS.md
1212
jobs:
13-
generate-matrix:
14-
name: Generate Build Matrix
15-
runs-on: ubuntu-latest
16-
outputs:
17-
matrix: ${{ steps.set-matrix.outputs.matrix }}
18-
steps:
19-
- uses: actions/checkout@v2
20-
- name: Generate Build Matrix
21-
id: set-matrix
22-
run: php .github/matrix.php "${{ github.event_name }}"
2313
test:
24-
needs: generate-matrix
2514
strategy:
26-
matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
15+
matrix:
16+
include:
17+
- name: LINUX_X64_DEBUG_NTS
18+
action: linux-x64
19+
configurationParameters: --enable-debug --disable-zts
20+
- name: LINUX_X64_RELEASE_ZTS
21+
action: linux-x64
22+
configurationParameters: --disable-debug --enable-zts
23+
# apt broken, not sure why
24+
# - name: LINUX_I386_DEBUG_ZTS
25+
# action: linux-i386
26+
# configurationParameters: --enable-debug --disable-zts
27+
- name: MACOS_DEBUG_NTS
28+
action: macos
29+
configurationParameters: --enable-debug --disable-zts
2730
fail-fast: false
2831
name: ${{ matrix.name }}
2932
runs-on: ${{ matrix['runs-on'] }}
30-
steps: ${{ matrix.steps }}
33+
steps:
34+
- uses: ${{ matrix.action }}
35+
with:
36+
configurationParameters: ${{ matrix.configurationParameters }}
37+
extendedTests: false

0 commit comments

Comments
 (0)