Skip to content

Commit 92ba014

Browse files
committed
adding two more macos jobs
1 parent 39a7d49 commit 92ba014

File tree

1 file changed

+28
-5
lines changed

1 file changed

+28
-5
lines changed

.github/workflows/push.yml

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,28 @@ jobs:
9898
- name: Verify generated files are up to date
9999
uses: ./.github/actions/verify-generated-files
100100
MACOS_DEBUG_NTS:
101-
runs-on: macos-12
101+
strategy:
102+
fail-fast: false
103+
matrix:
104+
include:
105+
- os: 12
106+
arch: X64
107+
debug: true
108+
zts: false
109+
- os: 12
110+
arch: X64
111+
debug: false
112+
zts: true
113+
- os: 14
114+
arch: ARM64
115+
debug: true
116+
zts: false
117+
- os: 14
118+
arch: ARM64
119+
debug: false
120+
zts: true
121+
name: "MACOS_${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}"
122+
runs-on: macos-${{ matrix.os }}
102123
steps:
103124
- name: git checkout
104125
uses: actions/checkout@v4
@@ -107,22 +128,24 @@ jobs:
107128
- name: ccache
108129
uses: hendrikmuhs/ccache-action@v1.2
109130
with:
110-
key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
131+
key: "${{github.job}}-${{matrix.os}}-{{ matrix.debug && 'DEBUG' || 'RELEASE' }}-${{ matrix.zts && 'ZTS' || 'NTS' }}-${{hashFiles('main/php_version.h')}}"
111132
append-timestamp: false
112133
- name: ./configure
113134
uses: ./.github/actions/configure-macos
114135
with:
115-
configurationParameters: --enable-debug --disable-zts
136+
configurationParameters: >-
137+
--${{ matrix.debug && 'enable' || 'disable' }}-debug
138+
--${{ matrix.zts && 'enable' || 'disable' }}-zts
116139
- name: make
117140
run: |-
118-
export PATH="/usr/local/opt/bison/bin:$PATH"
141+
export PATH="$(brew --prefix)/opt/bison/bin:$PATH"
119142
make -j$(sysctl -n hw.logicalcpu) >/dev/null
120143
- name: make install
121144
run: sudo make install
122145
- name: Test Tracing JIT
123146
uses: ./.github/actions/test-macos
124147
with:
125-
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
148+
testArtifacts: ${{ matrix.arch }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
126149
jitType: tracing
127150
runTestsParameters: >-
128151
-d zend_extension=opcache.so

0 commit comments

Comments
 (0)