Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -48717,7 +48717,7 @@ async function dockerBuild(container, maturinRelease, hostHomeMount, args) {
target.includes('i686')) {
commands.push('echo "::group::Install libatomic"', 'if command -v yum &> /dev/null; then yum install -y libatomic; else apt-get update && apt-get install -y libatomic1; fi', 'echo "::endgroup::"');
}
commands.push('echo "::group::Install Rust"', `command -v rustup &> /dev/null && { rm -frv ~/.rustup/toolchains/; rustup toolchain install stable; } || curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal`, 'export PATH="$HOME/.cargo/bin:$HOME/.local/bin:$PATH"', `echo "Install Rust toolchain ${rustToolchain}"`, `rustup update --no-self-update ${rustToolchain}`, `rustup override set ${rustToolchain}`, `rustup component add llvm-tools-preview || true`, 'echo "::endgroup::"', 'export PATH="$PATH:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin:/opt/python/cp312-cp312/bin"', 'echo "::group::Install maturin"', 'maturin_archive="$(mktemp)"', `curl --proto '=https' --tlsv1.2 -LsSf ${url} -o "$maturin_archive"`, checksumCommand, 'tar -xzf "$maturin_archive" -C /usr/local/bin', 'rm -f "$maturin_archive"', 'maturin --version || true', 'which uv > /dev/null || curl -LsSf https://astral.sh/uv/install.sh | sh', 'which patchelf > /dev/null || uv tool install patchelf', 'python3 -m pip install --user cffi || true', 'echo "::endgroup::"');
commands.push('echo "::group::Install Rust"', `command -v rustup &> /dev/null && { rm -frv ~/.rustup/toolchains/; rustup toolchain install stable; } || curl --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal`, 'export PATH="$HOME/.cargo/bin:$HOME/.local/bin:$PATH"', `echo "Install Rust toolchain ${rustToolchain}"`, `rustup update --no-self-update ${rustToolchain}`, `rustup override set ${rustToolchain}`, `rustup component add llvm-tools-preview || true`, 'echo "::endgroup::"', 'for py_bin in /opt/python/*/bin; do if [ -d "$py_bin" ]; then PATH="$PATH:$py_bin"; fi; done', 'echo "::group::Install maturin"', 'maturin_archive="$(mktemp)"', `curl --proto '=https' --tlsv1.2 -LsSf ${url} -o "$maturin_archive"`, checksumCommand, 'tar -xzf "$maturin_archive" -C /usr/local/bin', 'rm -f "$maturin_archive"', 'maturin --version || true', 'which uv > /dev/null || curl -LsSf https://astral.sh/uv/install.sh | sh', 'which patchelf > /dev/null || uv tool install patchelf', 'python3 -m pip install --user cffi || true', 'echo "::endgroup::"');
if (args.includes('--zig')) {
commands.push('echo "::group::Install Zig"', 'uv pip install --system --break-system-packages ziglang', 'echo "::endgroup::"');
}
Expand Down
4 changes: 2 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -775,8 +775,8 @@ async function dockerBuild(
`rustup override set ${rustToolchain}`,
`rustup component add llvm-tools-preview || true`,
'echo "::endgroup::"',
// Add all supported python versions to PATH
'export PATH="$PATH:/opt/python/cp37-cp37m/bin:/opt/python/cp38-cp38/bin:/opt/python/cp39-cp39/bin:/opt/python/cp310-cp310/bin:/opt/python/cp311-cp311/bin:/opt/python/cp312-cp312/bin"',
// Glob so new interpreters are added without maintaining a list
'for py_bin in /opt/python/*/bin; do if [ -d "$py_bin" ]; then PATH="$PATH:$py_bin"; fi; done',
// Install maturin
'echo "::group::Install maturin"',
'maturin_archive="$(mktemp)"',
Expand Down
Loading