@@ -109,7 +109,12 @@ jobs:
109
109
strategy :
110
110
fail-fast : false
111
111
matrix :
112
- os : [macos-latest, ubuntu-latest, windows-latest, macos-arm]
112
+ os : [
113
+ macos-13, # x64
114
+ macos-14, # ARM
115
+ ubuntu-latest,
116
+ windows-latest,
117
+ ]
113
118
ocaml_compiler : [4.14.0]
114
119
115
120
runs-on : ${{matrix.os}}
@@ -230,24 +235,24 @@ jobs:
230
235
if : runner.os == 'Windows'
231
236
run : node scripts/ciTest.js -mocha -theme -format
232
237
233
- # Build the playground compiler on our fastest runner (macOS ARM )
238
+ # Build the playground compiler on the fastest runner (ubuntu-latest )
234
239
- name : Install JSOO
235
- if : matrix.os == 'macos-arm '
240
+ if : matrix.os == 'ubuntu-latest '
236
241
run : opam install js_of_ocaml.4.0.0
237
242
238
243
- name : Build playground compiler
239
- if : matrix.os == 'macos-arm '
244
+ if : matrix.os == 'ubuntu-latest '
240
245
run : |
241
246
opam exec -- node packages/playground-bundling/scripts/generate_cmijs.js
242
247
opam exec -- dune build --profile browser
243
248
cp ./_build/default/jscomp/jsoo/jsoo_playground_main.bc.js playground/compiler.js
244
249
245
250
- name : Test playground compiler
246
- if : matrix.os == 'macos-arm '
251
+ if : matrix.os == 'ubuntu-latest '
247
252
run : node playground/playground_test.js
248
253
249
254
- name : Upload playground compiler to CDN
250
- if : ${{ matrix.os == 'macos-arm ' && startsWith(github.ref, 'refs/tags/v') }}
255
+ if : ${{ matrix.os == 'ubuntu-latest ' && startsWith(github.ref, 'refs/tags/v') }}
251
256
env :
252
257
KEYCDN_USER : ${{ secrets.KEYCDN_USER }}
253
258
KEYCDN_PASSWORD : ${{ secrets.KEYCDN_PASSWORD }}
@@ -324,10 +329,9 @@ jobs:
324
329
strategy :
325
330
fail-fast : false
326
331
matrix :
327
- os :
328
- [
329
- macos-latest,
330
- macos-arm,
332
+ os : [
333
+ macos-13, # x64
334
+ macos-14, # ARM
331
335
ubuntu-latest,
332
336
buildjet-2vcpu-ubuntu-2204-arm,
333
337
windows-latest,
0 commit comments