Skip to content

Commit de63e4a

Browse files
darkterminaldarkterminal
committed
build: add macos 14 and 15
1 parent df820a0 commit de63e4a

File tree

1 file changed

+142
-30
lines changed

1 file changed

+142
-30
lines changed

‎.github/workflows/cross-compile.yml

+142-30
Original file line numberDiff line numberDiff line change
@@ -42,110 +42,222 @@ jobs:
4242
target: x86_64-unknown-linux-gnu
4343
php-versions: '8.3'
4444
phpts: 'nts'
45+
46+
# -------------------------- Start BETA MacOS 14 --------------------------
4547

4648
# Macos x64 - PHP8.0 - NTS
47-
- build: x86_64-apple-darwin
48-
os: macos-latest
49+
- build: x86_64-apple-darwin-macos-14
50+
os: macos-latest-large
4951
target: x86_64-apple-darwin
5052
php-versions: '8.0'
5153
phpts: 'nts'
5254

53-
- build: aarch64-apple-darwin
55+
- build: aarch64-apple-darwin-macos-14
5456
os: macos-latest
5557
target: aarch64-apple-darwin
5658
php-versions: '8.0'
5759
phpts: 'nts'
5860

59-
# Macos x64 - PHP8.1 - NTS
60-
- build: x86_64-apple-darwin
61+
# Macos x64 - PHP8.0 - TS
62+
- build: x86_64-apple-darwin-macos-14
63+
os: macos-latest-large
64+
target: x86_64-apple-darwin
65+
php-versions: '8.0'
66+
phpts: 'ts'
67+
68+
- build: aarch64-apple-darwin-macos-14
6169
os: macos-latest
70+
target: aarch64-apple-darwin
71+
php-versions: '8.0'
72+
phpts: 'ts'
73+
74+
# Macos x64 - PHP8.1 - NTS
75+
- build: x86_64-apple-darwin-macos-14
76+
os: macos-latest-large
6277
target: x86_64-apple-darwin
6378
php-versions: '8.1'
6479
phpts: 'nts'
6580

66-
- build: aarch64-apple-darwin
81+
- build: aarch64-apple-darwin-macos-14
6782
os: macos-latest
6883
target: aarch64-apple-darwin
6984
php-versions: '8.1'
7085
phpts: 'nts'
86+
87+
# Macos x64 - PHP8.1 - TS
88+
- build: x86_64-apple-darwin-macos-14
89+
os: macos-latest-large
90+
target: x86_64-apple-darwin
91+
php-versions: '8.1'
92+
phpts: 'ts'
93+
94+
- build: aarch64-apple-darwin-macos-14
95+
os: macos-latest
96+
target: aarch64-apple-darwin
97+
php-versions: '8.1'
98+
phpts: 'ts'
7199

72100
# Macos x64 - PHP8.2 - NTS
73-
- build: x86_64-apple-darwin
74-
os: macos-latest
101+
- build: x86_64-apple-darwin-macos-14
102+
os: macos-latest-large
75103
target: x86_64-apple-darwin
76104
php-versions: '8.2'
77105
phpts: 'nts'
78106

79-
- build: aarch64-apple-darwin
107+
- build: aarch64-apple-darwin-macos-14
80108
os: macos-latest
81109
target: aarch64-apple-darwin
82110
php-versions: '8.2'
83111
phpts: 'nts'
112+
113+
# Macos x64 - PHP8.2 - TS
114+
- build: x86_64-apple-darwin-macos-14
115+
os: macos-latest-large
116+
target: x86_64-apple-darwin
117+
php-versions: '8.2'
118+
phpts: 'ts'
119+
120+
- build: aarch64-apple-darwin-macos-14
121+
os: macos-latest
122+
target: aarch64-apple-darwin
123+
php-versions: '8.2'
124+
phpts: 'ts'
84125

85126
# Macos x64 - PHP8.3 - NTS
86-
- build: x86_64-apple-darwin
87-
os: macos-latest
127+
- build: x86_64-apple-darwin-macos-14
128+
os: macos-latest-large
88129
target: x86_64-apple-darwin
89130
php-versions: '8.3'
90131
phpts: 'nts'
91132

92-
- build: aarch64-apple-darwin
133+
- build: aarch64-apple-darwin-macos-14
93134
os: macos-latest
94135
target: aarch64-apple-darwin
95136
php-versions: '8.3'
96137
phpts: 'nts'
97138

98-
# Macos x64 - PHP8.0 - TS
99-
- build: x86_64-apple-darwin
139+
# Macos x64 - PHP8.3 - TS
140+
- build: x86_64-apple-darwin-macos-14
141+
os: macos-latest-large
142+
target: x86_64-apple-darwin
143+
php-versions: '8.3'
144+
phpts: 'ts'
145+
146+
- build: aarch64-apple-darwin-macos-14
100147
os: macos-latest
148+
target: aarch64-apple-darwin
149+
php-versions: '8.3'
150+
phpts: 'ts'
151+
152+
# -------------------------- End BETA MacOS 14 --------------------------
153+
154+
# -------------------------- Start BETA MacOS 15 --------------------------
155+
156+
# Macos x64 - PHP8.0 - NTS
157+
- build: x86_64-apple-darwin-macos-15-beta
158+
os: macos-15-large
159+
target: x86_64-apple-darwin
160+
php-versions: '8.0'
161+
phpts: 'nts'
162+
163+
- build: aarch64-apple-darwin-macos-15-beta
164+
os: macos-15
165+
target: aarch64-apple-darwin
166+
php-versions: '8.0'
167+
phpts: 'nts'
168+
169+
# Macos x64 - PHP8.0 - TS
170+
- build: x86_64-apple-darwin-macos-15-beta
171+
os: macos-15-large
101172
target: x86_64-apple-darwin
102173
php-versions: '8.0'
103174
phpts: 'ts'
104175

105-
- build: aarch64-apple-darwin
106-
os: macos-latest
176+
- build: aarch64-apple-darwin-macos-15-beta
177+
os: macos-15
107178
target: aarch64-apple-darwin
108179
php-versions: '8.0'
109180
phpts: 'ts'
110181

182+
# Macos x64 - PHP8.1 - NTS
183+
- build: x86_64-apple-darwin-macos-15-beta
184+
os: macos-15-large
185+
target: x86_64-apple-darwin
186+
php-versions: '8.1'
187+
phpts: 'nts'
188+
189+
- build: aarch64-apple-darwin-macos-15-beta
190+
os: macos-15
191+
target: aarch64-apple-darwin
192+
php-versions: '8.1'
193+
phpts: 'nts'
194+
111195
# Macos x64 - PHP8.1 - TS
112-
- build: x86_64-apple-darwin
113-
os: macos-latest
196+
- build: x86_64-apple-darwin-macos-15-beta
197+
os: macos-15-large
114198
target: x86_64-apple-darwin
115199
php-versions: '8.1'
116200
phpts: 'ts'
117201

118-
- build: aarch64-apple-darwin
119-
os: macos-latest
202+
- build: aarch64-apple-darwin-macos-15-beta
203+
os: macos-15
120204
target: aarch64-apple-darwin
121205
php-versions: '8.1'
122206
phpts: 'ts'
123207

208+
# Macos x64 - PHP8.2 - NTS
209+
- build: x86_64-apple-darwin-macos-15-beta
210+
os: macos-15-large
211+
target: x86_64-apple-darwin
212+
php-versions: '8.2'
213+
phpts: 'nts'
214+
215+
- build: aarch64-apple-darwin-macos-15-beta
216+
os: macos-15
217+
target: aarch64-apple-darwin
218+
php-versions: '8.2'
219+
phpts: 'nts'
220+
124221
# Macos x64 - PHP8.2 - TS
125-
- build: x86_64-apple-darwin
126-
os: macos-latest
222+
- build: x86_64-apple-darwin-macos-15-beta
223+
os: macos-15-large
127224
target: x86_64-apple-darwin
128225
php-versions: '8.2'
129226
phpts: 'ts'
130227

131-
- build: aarch64-apple-darwin
132-
os: macos-latest
228+
- build: aarch64-apple-darwin-macos-15-beta
229+
os: macos-15
133230
target: aarch64-apple-darwin
134231
php-versions: '8.2'
135232
phpts: 'ts'
136233

234+
# Macos x64 - PHP8.3 - NTS
235+
- build: x86_64-apple-darwin-macos-15-beta
236+
os: macos-15-large
237+
target: x86_64-apple-darwin
238+
php-versions: '8.3'
239+
phpts: 'nts'
240+
241+
- build: aarch64-apple-darwin-macos-15-beta
242+
os: macos-15
243+
target: aarch64-apple-darwin
244+
php-versions: '8.3'
245+
phpts: 'nts'
246+
137247
# Macos x64 - PHP8.3 - TS
138-
- build: x86_64-apple-darwin
139-
os: macos-latest
248+
- build: x86_64-apple-darwin-macos-15-beta
249+
os: macos-15-large
140250
target: x86_64-apple-darwin
141251
php-versions: '8.3'
142252
phpts: 'ts'
143253

144-
- build: aarch64-apple-darwin
145-
os: macos-latest
254+
- build: aarch64-apple-darwin-macos-15-beta
255+
os: macos-15
146256
target: aarch64-apple-darwin
147257
php-versions: '8.3'
148258
phpts: 'ts'
259+
260+
# -------------------------- End BETA MacOS 15 --------------------------
149261

150262
# Windows x64 - PHP8.0 - NTS
151263
- build: x86_64-pc-windows-msvc
@@ -234,7 +346,7 @@ jobs:
234346
if: matrix.os == 'ubuntu-latest'
235347
run: |
236348
cargo install cross
237-
export CROSS_CONFIG=./Cross_php-${{ matrix.php-versions }}.toml
349+
export CROSS_CONFIG=./cross/Cross_php-${{ matrix.php-versions }}.toml
238350
cross build --release --target ${{ matrix.target }}
239351
240352
- name: Build Extension
@@ -253,7 +365,7 @@ jobs:
253365
dirname="$binary_name-$version-php-${{ matrix.php-versions }}-${{ matrix.phpts }}-${{ matrix.target }}"
254366
mkdir "$dirname"
255367
256-
if [ "${{ matrix.os }}" = "macos-latest" ]; then
368+
if [ "${{ matrix.os }}" == *"macos"* ]; then
257369
cp "target/${{ matrix.target }}/release/lib${binary_name}.dylib" "target/${{ matrix.target }}/release/lib${binary_name}.so"
258370
mv "target/${{ matrix.target }}/release/lib${binary_name}.dylib" "$dirname"
259371
mv "target/${{ matrix.target }}/release/lib${binary_name}.so" "$dirname"

0 commit comments

Comments
 (0)