Skip to content

ci: finish soldr build migration for PyO3 ext + final else arm (#1012 PR 2 followup)#799

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
zackees merged 1 commit into from
Jun 28, 2026
Merged

ci: finish soldr build migration for PyO3 ext + final else arm (#1012 PR 2 followup) #799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions .github/workflows/template_native_build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -219,7 +219,10 @@ jobs:
-p fbuild-cli \
-p fbuild-daemon
else
soldr cargo build --release --target ${{ inputs.target }} \
# soldr#1012 PR 2 followup: blessed default surface (was
# `soldr cargo build`). Same byte-identical artifact today;
# gains catalogue-driven sysroot prep as #1012 phases ship.
soldr build --release --target ${{ inputs.target }} \
-p fbuild-cli \
-p fbuild-daemon
fi
Expand DownExpand Up@@ -253,7 +256,12 @@ jobs:
--target ${{ inputs.target }} -p fbuild-python \
--features extension-module
elif [ "${{ runner.os }}" = "Linux" ] && [[ "${{ inputs.target }}" == *-pc-windows-msvc ]]; then
PYO3_NO_PYTHON=1 cargo xwin build --release \
# Blessed Linux→Windows MSVC path for PyO3 ext
# (soldr#1012 PR 2 followup). soldr build's
# Commands::Build installs the soldr-clang-shim so
# ring + cc-rs route through clang-cl correctly even
# for aarch64 PyO3 dylib compilation.
PYO3_NO_PYTHON=1 soldr build --release \
--target-dir "${PYTHON_TARGET_DIR}" \
--target ${{ inputs.target }} -p fbuild-python \
--features extension-module
Expand All@@ -268,17 +276,20 @@ jobs:
--target "${PYO3_TARGET}.2.17" -p fbuild-python \
--features extension-module
elif [ "${{ inputs.macos_cross }}" = "true" ]; then
PYO3_NO_PYTHON=1 soldr cargo build --release \
# soldr#1012 PR 2 followup: blessed default surface.
PYO3_NO_PYTHON=1 soldr build --release \
--target-dir "${PYTHON_TARGET_DIR}" \
--target ${{ inputs.target }} -p fbuild-python \
--features extension-module
elif [ "${{ runner.os }}" = "macOS" ]; then
soldr cargo build --release --target-dir "${PYTHON_TARGET_DIR}" \
# soldr#1012 PR 2 followup: blessed default surface.
soldr build --release --target-dir "${PYTHON_TARGET_DIR}" \
--target ${{ inputs.target }} \
-p fbuild-python \
--features extension-module
else
soldr cargo build --release --target-dir "${PYTHON_TARGET_DIR}" \
# soldr#1012 PR 2 followup: blessed default surface.
soldr build --release --target-dir "${PYTHON_TARGET_DIR}" \
--target ${{ inputs.target }} \
-p fbuild-python \
--features extension-module
Expand Down
Loading