Skip to content

Commit 14129f5

Browse files
committed
fix: update channel ordering to reflecte priority
Signed-off-by: Seth Stadick <sstadick@gmail.com>
1 parent d560f60 commit 14129f5

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

.github/workflows/build-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Build packages
2929
shell: bash
30-
run: pixi run build-all --channel https://prefix.dev/modular-community --channel https://conda.modular.com/max
30+
run: pixi run build-all
3131
env:
3232
RATTLER_BUILD_ENABLE_GITHUB_INTEGRATION: true
3333
RATTLER_BUILD_COLOR: always

.github/workflows/build-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: Build packages
3636
shell: bash
37-
run: pixi run build-all --channel https://prefix.dev/modular-community --channel https://conda.modular.com/max
37+
run: pixi run build-all
3838
env:
3939
RATTLER_BUILD_ENABLE_GITHUB_INTEGRATION: true
4040
RATTLER_BUILD_COLOR: always

scripts/build-all.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import sys
1111
import os
1212

13+
# Channels are in priority order
14+
DEFAULT_CHANNELS = ["conda-forge", "max", "modular-community"]
1315

1416
def main() -> None:
1517
parser = argparse.ArgumentParser(description="Build all recipes.")
@@ -48,12 +50,16 @@ def main() -> None:
4850
"build",
4951
]
5052

53+
for channel in DEFAULT_CHANNELS:
54+
command.extend(["--channel", channel])
55+
5156
for channel in args.channel:
57+
if channel in DEFAULT_CHANNELS:
58+
continue
5259
command.extend(["--channel", channel])
60+
5361
command.extend(
5462
[
55-
"--channel",
56-
"conda-forge",
5763
"--variant-config",
5864
variant_config,
5965
"--skip-existing=all",

0 commit comments

Comments
 (0)