Skip to content

Commit bfb1c53

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

4 files changed

Lines changed: 18 additions & 7 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: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,19 @@
1010
import sys
1111
import os
1212

13+
# Channels are in priority order
14+
DEFAULT_CHANNELS = [
15+
"conda-forge",
16+
"https://conda.modular.com/max",
17+
"https://prefix.dev/modular-community",
18+
]
19+
1320

1421
def main() -> None:
1522
parser = argparse.ArgumentParser(description="Build all recipes.")
1623
parser.add_argument(
1724
"--channel",
1825
action="append",
19-
required=True,
2026
help="The channels to use for building.",
2127
)
2228
parser.add_argument(
@@ -48,12 +54,17 @@ def main() -> None:
4854
"build",
4955
]
5056

51-
for channel in args.channel:
57+
for channel in DEFAULT_CHANNELS:
5258
command.extend(["--channel", channel])
59+
60+
if args.channel is not None:
61+
for channel in args.channel:
62+
if channel in DEFAULT_CHANNELS:
63+
continue
64+
command.extend(["--channel", channel])
65+
5366
command.extend(
5467
[
55-
"--channel",
56-
"conda-forge",
5768
"--variant-config",
5869
variant_config,
5970
"--skip-existing=all",

scripts/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def commit_push_changes(message: str, branch_name: str) -> None:
4949

5050

5151
def run_command_unchecked(command: list[str]) -> subprocess.CompletedProcess[Any]:
52-
eprint(f'Run command: {" ".join(command)}')
52+
eprint(f"Run command: {' '.join(command)}")
5353
result = subprocess.run(command, capture_output=True, text=True)
5454
return result
5555

0 commit comments

Comments
 (0)