Skip to content

Commit 9b58f09

Browse files
committed
CI: skip default-packages on every macos_job.yml callsite
pytorch/test-infra's setup-miniconda action pre-installs cmake=3.22 ninja=1.10 pkg-config=0.29 wheel=0.37 from the anaconda defaults channel into the conda env it sets up for macOS jobs. Our own setup-conda.sh then installs cmake=3.31.2 and friends from conda-forge into the same env, and reconciling the two channels' transitive deps (e.g. zlib=1.2.13 vs libzlib>=1.3.1, rhash=1.4.3 vs rhash>=1.4.5) has been intermittently failing the libmamba solver. The companion test-infra PR exposes a default-packages input on macos_job.yml. Pass an empty string from every macos_job.yml callsite in this repo so the conda env created by setup-miniconda no longer pre-pollutes the env with defaults-channel packages we don't use, and our subsequent conda-forge install resolves cleanly. This change has no effect until the test-infra PR lands. Once it's merged on test-infra@main, the workflows here pick it up automatically because executorch tracks @main for all test-infra references. Authored with Claude Code.
1 parent e84a418 commit 9b58f09

8 files changed

Lines changed: 32 additions & 0 deletions

File tree

.github/workflows/_test_backend.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ jobs:
124124

125125
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
126126
with:
127+
default-packages: ""
127128
ref: ${{ inputs.ref }}
128129
runner: macos-m1-stable
129130
python-version: "3.12"

.github/workflows/_unittest.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ jobs:
4444
macos:
4545
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
4646
with:
47+
default-packages: ""
4748
runner: macos-m1-stable
4849
python-version: '3.11'
4950
submodules: 'recursive'

.github/workflows/apple.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ jobs:
8888
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
8989
secrets: inherit
9090
with:
91+
default-packages: ""
9192
runner: macos-14-xlarge
9293
python-version: '3.11'
9394
submodules: 'recursive'
@@ -175,6 +176,7 @@ jobs:
175176
needs: set-version
176177
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
177178
with:
179+
default-packages: ""
178180
runner: macos-14-xlarge
179181
python-version: '3.11'
180182
submodules: 'recursive'
@@ -315,6 +317,7 @@ jobs:
315317
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
316318
secrets: inherit
317319
with:
320+
default-packages: ""
318321
runner: macos-14-xlarge
319322
python-version: '3.11'
320323
submodules: 'recursive'

.github/workflows/build-presets.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ jobs:
2020
matrix:
2121
preset: [macos, ios, ios-simulator, pybind, profiling, llm]
2222
with:
23+
default-packages: ""
2324
job-name: build
2425
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
2526
runner: macos-14-xlarge

.github/workflows/metal.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
name: test-executorch-metal-build
2626
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
2727
with:
28+
default-packages: ""
2829
runner: macos-m2-stable
2930
python-version: '3.11'
3031
submodules: 'recursive'
@@ -41,6 +42,7 @@ jobs:
4142
name: test-metal-backend-modules
4243
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
4344
with:
45+
default-packages: ""
4446
runner: macos-m2-stable
4547
python-version: '3.11'
4648
submodules: 'recursive'
@@ -65,6 +67,7 @@ jobs:
6567
name: test-metal-qwen35-moe-tiny
6668
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
6769
with:
70+
default-packages: ""
6871
runner: macos-m2-stable
6972
python-version: '3.11'
7073
submodules: 'recursive'
@@ -187,6 +190,7 @@ jobs:
187190
name: "Voxtral-Mini-4B-Realtime-2602"
188191
quant: "non-quantized"
189192
with:
193+
default-packages: ""
190194
runner: macos-m2-stable
191195
python-version: '3.11'
192196
submodules: 'recursive'
@@ -252,6 +256,7 @@ jobs:
252256
name: "Voxtral-Mini-4B-Realtime-2602"
253257
quant: "non-quantized"
254258
with:
259+
default-packages: ""
255260
runner: macos-m2-stable
256261
python-version: '3.11'
257262
submodules: 'recursive'

.github/workflows/mlx.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
test-mlx:
2929
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
3030
with:
31+
default-packages: ""
3132
job-name: test-mlx
3233
runner: macos-14-xlarge
3334
python-version: "3.12"
@@ -77,6 +78,7 @@ jobs:
7778
test-mlx-qwen35-moe:
7879
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
7980
with:
81+
default-packages: ""
8082
job-name: test-mlx-qwen35-moe
8183
runner: macos-14-xlarge
8284
python-version: "3.12"
@@ -132,6 +134,7 @@ jobs:
132134
suite: [models, operators]
133135
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
134136
with:
137+
default-packages: ""
135138
job-name: test-mlx-backend-${{ matrix.suite }}
136139
runner: macos-14-xlarge
137140
python-version: "3.12"
@@ -173,6 +176,7 @@ jobs:
173176
test-mlx-parakeet:
174177
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
175178
with:
179+
default-packages: ""
176180
job-name: test-mlx-parakeet
177181
runner: macos-14-xlarge
178182
python-version: "3.12"
@@ -231,6 +235,7 @@ jobs:
231235
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
232236
secrets: inherit
233237
with:
238+
default-packages: ""
234239
job-name: test-mlx-voxtral
235240
runner: macos-14-xlarge
236241
python-version: "3.12"
@@ -291,6 +296,7 @@ jobs:
291296
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
292297
secrets: inherit
293298
with:
299+
default-packages: ""
294300
job-name: test-mlx-voxtral-realtime
295301
runner: macos-14-xlarge
296302
python-version: "3.12"
@@ -366,6 +372,7 @@ jobs:
366372
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
367373
secrets: inherit
368374
with:
375+
default-packages: ""
369376
job-name: test-mlx-whisper
370377
runner: macos-14-xlarge
371378
python-version: "3.12"
@@ -413,6 +420,7 @@ jobs:
413420
test-mlx-stories110m:
414421
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
415422
with:
423+
default-packages: ""
416424
job-name: test-mlx-stories110m
417425
runner: macos-14-xlarge
418426
python-version: "3.12"
@@ -492,6 +500,7 @@ jobs:
492500
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
493501
secrets: inherit
494502
with:
503+
default-packages: ""
495504
job-name: test-mlx-llm-${{ matrix.model.name }}${{ matrix.use-custom && '-custom' || '' }}-${{ matrix.qconfig }}
496505
runner: macos-14-xlarge
497506
python-version: "3.12"

.github/workflows/pull.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,6 +1521,7 @@ jobs:
15211521
runner: [macos-m1-stable, macos-m2-stable]
15221522
fail-fast: false
15231523
with:
1524+
default-packages: ""
15241525
runner: ${{ matrix.runner }}
15251526
submodules: 'recursive'
15261527
ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

.github/workflows/trunk.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
backend: portable
4141
fail-fast: false
4242
with:
43+
default-packages: ""
4344
runner: macos-m1-stable
4445
python-version: '3.11'
4546
submodules: 'recursive'
@@ -275,6 +276,7 @@ jobs:
275276
- build-tool: cmake
276277
fail-fast: false
277278
with:
279+
default-packages: ""
278280
runner: macos-m1-stable
279281
python-version: '3.11'
280282
submodules: 'recursive'
@@ -297,6 +299,7 @@ jobs:
297299
- build-tool: cmake
298300
fail-fast: false
299301
with:
302+
default-packages: ""
300303
runner: macos-m1-stable
301304
python-version: '3.11'
302305
submodules: 'recursive'
@@ -457,6 +460,7 @@ jobs:
457460
name: test-coreml-delegate
458461
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
459462
with:
463+
default-packages: ""
460464
runner: macos-14-xlarge
461465
python-version: '3.11'
462466
submodules: 'recursive'
@@ -475,6 +479,7 @@ jobs:
475479
name: test-static-llama-ane
476480
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
477481
with:
482+
default-packages: ""
478483
runner: macos-m1-stable
479484
python-version: '3.11'
480485
submodules: 'recursive'
@@ -497,6 +502,7 @@ jobs:
497502
name: test-llama-torchao-lowbit
498503
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
499504
with:
505+
default-packages: ""
500506
runner: macos-m1-stable
501507
python-version: '3.11'
502508
submodules: 'recursive'
@@ -581,6 +587,7 @@ jobs:
581587
mode: [mps, coreml, xnnpack+custom+quantize_kv]
582588
fail-fast: false
583589
with:
590+
default-packages: ""
584591
runner: macos-m1-stable
585592
python-version: '3.11'
586593
submodules: 'recursive'
@@ -667,6 +674,7 @@ jobs:
667674
matrix:
668675
model: ["gemma3-4b"] # llava gives segfault so not covering.
669676
with:
677+
default-packages: ""
670678
secrets-env: EXECUTORCH_HF_TOKEN
671679
runner: macos-15-xlarge
672680
python-version: '3.11'
@@ -754,6 +762,7 @@ jobs:
754762
model: [dl3, edsr, efficient_sam, emformer_join, emformer_transcribe, ic3, ic4, mobilebert, mv2, mv3, resnet50, vit, w2l]
755763
fail-fast: false
756764
with:
765+
default-packages: ""
757766
runner: macos-m1-stable
758767
python-version: '3.11'
759768
submodules: 'recursive'
@@ -793,6 +802,7 @@ jobs:
793802
strategy:
794803
fail-fast: false
795804
with:
805+
default-packages: ""
796806
runner: macos-m1-stable
797807
python-version: '3.11'
798808
submodules: 'recursive'
@@ -932,6 +942,7 @@ jobs:
932942
]
933943
fail-fast: false
934944
with:
945+
default-packages: ""
935946
secrets-env: EXECUTORCH_HF_TOKEN
936947
runner: macos-15-xlarge
937948
python-version: '3.11'

0 commit comments

Comments
 (0)