Skip to content

Restructure CI with matrix approach and multi-feature support #7376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 4 commits into from
Mar 7, 2026
Merged

Restructure CI with matrix approach and multi-feature support #7376

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87aa7ad
`--features` flag can take multiple values
ShaharNaveh Mar 7, 2026
89d4b84
Simplify CI job
ShaharNaveh Mar 7, 2026
9a84b59
Remove bad default
ShaharNaveh Mar 7, 2026
a2a80ab
Enable jit on macOS
ShaharNaveh Mar 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,13 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-2025]
include:
- os: macos-latest
cargo_args: "" # TODO: Fix jit on macOS

@youknowone youknowone Mar 7, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jit seems to be fixed on macos now

@ShaharNaveh ShaharNaveh Mar 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll try

- os: ubuntu-latest
cargo_args: "--features jit"
- os: windows-2025
cargo_args: "--features jit"
fail-fast: false
steps:
- uses: actions/checkout@v6.0.2
Expand All @@ -302,18 +308,14 @@ jobs:
- uses: actions/setup-python@v6.2.0
with:
python-version: ${{ env.PYTHON_VERSION }}

- name: Set up the Mac environment
run: brew install autoconf automake libtool openssl@3
if: runner.os == 'macOS'

- name: build rustpython
run: cargo build --release --verbose --features=threading ${{ env.CARGO_ARGS }}
if: runner.os == 'macOS'
- name: build rustpython
run: cargo build --release --verbose --features=threading ${{ env.CARGO_ARGS }},jit
if: runner.os != 'macOS'
- uses: actions/setup-python@v6.2.0
with:
python-version: ${{ env.PYTHON_VERSION }}
run: cargo build --release --verbose --features=threading ${{ env.CARGO_ARGS }} ${{ matrix.cargo_args }}

- name: run snippets
run: python -m pip install -r requirements.txt && pytest -v
working-directory: ./extra_tests
Expand Down Expand Up @@ -445,14 +447,10 @@ jobs:
run: |
target/release/rustpython -m venv testvenv
testvenv/bin/rustpython -m pip install wheel
- if: runner.os != 'macOS'
name: Check whats_left is not broken
shell: bash
run: python -I scripts/whats_left.py --no-default-features --features "$(sed -e 's/--[^ ]*//g' <<< "${{ env.CARGO_ARGS }}" | tr -d '[:space:]'),threading,jit"
- if: runner.os == 'macOS' # TODO fix jit on macOS
name: Check whats_left is not broken (macOS)

- name: Check whats_left is not broken
shell: bash
run: python -I scripts/whats_left.py --no-default-features --features "$(sed -e 's/--[^ ]*//g' <<< "${{ env.CARGO_ARGS }}" | tr -d '[:space:]'),threading" # no jit on macOS for now
run: python -I scripts/whats_left.py ${{ env.CARGO_ARGS }} ${{ matrix.cargo_args }}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

lint:
name: Lint Rust & Python code
Expand Down
14 changes: 9 additions & 5 deletions scripts/whats_left.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ def parse_args():
)
parser.add_argument(
"--features",
action="store",
help="which features to enable when building RustPython (default: ssl)",
default="ssl",
action="append",
help="which features to enable when building RustPython (default: [ssl])",
default=["ssl"],

@coderabbitai coderabbitai Bot Mar 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

Bug: action="append" with non-None default causes incorrect feature handling.

Using action="append" with default=["ssl"] has two issues:

  1. The default list is not cleared when --features is provided—values append to it, causing ["ssl", ...] always to include ssl.
  2. Comma-separated values like --features "ssl,sqlite" are treated as a single string element, not split into separate features.

Per the context snippet from .github/workflows/cron-ci.yaml:95-100, the workflow calls --features "ssl,sqlite", which would result in ["ssl", "ssl,sqlite"] and joined_features = "ssl,ssl,sqlite".

🐛 Proposed fix: Use `default=None` and set default after parsing 
     parser.add_argument(
         "--features",
         action="append",
-        help="which features to enable when building RustPython (default: [ssl])",
-        default=["ssl"],
+        help="which features to enable when building RustPython (default: ssl)",
+        default=None,
     )

     args = parser.parse_args()
+    if args.features is None:
+        args.features = ["ssl"]
     return args

Alternatively, if the intent is to accept comma-separated features in a single --features argument (matching cargo's behavior), the values should be split:

🔧 Alternative: Split comma-separated values 
+    # Flatten comma-separated features into individual items
+    if args.features:
+        args.features = [f for feat in args.features for f in feat.split(",")]
+    else:
+        args.features = ["ssl"]
     return args
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@scripts/whats_left.py` around lines 70 - 72, The current add_argument call
for the --features flag uses action="append" with default=["ssl"], which causes
the default to persist and prevents splitting comma-separated inputs; change the
add_argument for --features to use default=None (keep action="append" or
consider action="store" depending on desired behavior), and after parsing args
in the main routine (where args is available) set args.features = ["ssl"] if
args.features is None; additionally, if you want to support comma-separated
lists like "ssl,sqlite", normalize by splitting each entry on commas and
flattening/stripping them (apply this normalization to the values collected for
args.features) so --features "ssl,sqlite" yields ["ssl","sqlite"] and providing
--features overrides the default instead of appending to it.

)

args = parser.parse_args()
Expand Down Expand Up @@ -449,16 +449,20 @@ def remove_one_indent(s):
cargo_build_command = ["cargo", "build", "--release"]
if args.no_default_features:
cargo_build_command.append("--no-default-features")

joined_features = ",".join(args.features)
if args.features:
cargo_build_command.extend(["--features", args.features])
cargo_build_command.extend(["--features", joined_features])

subprocess.run(cargo_build_command, check=True)

cargo_run_command = ["cargo", "run", "--release"]
if args.no_default_features:
cargo_run_command.append("--no-default-features")

if args.features:
cargo_run_command.extend(["--features", args.features])
cargo_run_command.extend(["--features", joined_features])

cargo_run_command.extend(["-q", "--", GENERATED_FILE])

result = subprocess.run(
Expand Down
Loading