@@ -109,7 +109,12 @@ jobs:
109109 strategy :
110110 fail-fast : false
111111 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+ ]
113118 ocaml_compiler : [4.14.0]
114119
115120 runs-on : ${{matrix.os}}
@@ -230,24 +235,24 @@ jobs:
230235 if : runner.os == 'Windows'
231236 run : node scripts/ciTest.js -mocha -theme -format
232237
233- # Build the playground compiler on our fastest runner (macOS ARM )
238+ # Build the playground compiler on the fastest runner (ubuntu-latest )
234239 - name : Install JSOO
235- if : matrix.os == 'macos-arm '
240+ if : matrix.os == 'ubuntu-latest '
236241 run : opam install js_of_ocaml.4.0.0
237242
238243 - name : Build playground compiler
239- if : matrix.os == 'macos-arm '
244+ if : matrix.os == 'ubuntu-latest '
240245 run : |
241246 opam exec -- node packages/playground-bundling/scripts/generate_cmijs.js
242247 opam exec -- dune build --profile browser
243248 cp ./_build/default/jscomp/jsoo/jsoo_playground_main.bc.js playground/compiler.js
244249
245250 - name : Test playground compiler
246- if : matrix.os == 'macos-arm '
251+ if : matrix.os == 'ubuntu-latest '
247252 run : node playground/playground_test.js
248253
249254 - 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') }}
251256 env :
252257 KEYCDN_USER : ${{ secrets.KEYCDN_USER }}
253258 KEYCDN_PASSWORD : ${{ secrets.KEYCDN_PASSWORD }}
@@ -324,10 +329,9 @@ jobs:
324329 strategy :
325330 fail-fast : false
326331 matrix :
327- os :
328- [
329- macos-latest,
330- macos-arm,
332+ os : [
333+ macos-13, # x64
334+ macos-14, # ARM
331335 ubuntu-latest,
332336 buildjet-2vcpu-ubuntu-2204-arm,
333337 windows-latest,
0 commit comments