Skip to content
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

Use new musl cross build Docker images #702

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Use new musl cross build Docker images #702

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
18 changes: 12 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,15 @@ jobs:
strategy:
fail-fast: false
matrix:
target: [i686-musl, armv7-musleabihf, aarch64-musl, x86_64-musl]
target:
[
i686-unknown-linux-musl,
armv7-unknown-linux-musleabihf,
aarch64-unknown-linux-musl,
x86_64-unknown-linux-musl,
Comment on lines -92 to +97
Copy link
Contributor Author

@zanieb zanieb Oct 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

When published upstream, these tags are shortened. I didn't bother with that in the fork.

]
container:
image: docker://benfred/rust-musl-cross:${{ matrix.target }}
image: ghcr.io/benfred/rust-musl-cross:${{ matrix.target }}
env:
RUSTUP_HOME: /root/.rustup
CARGO_HOME: /root/.cargo
Expand All @@ -101,15 +107,15 @@ jobs:
- name: Build
run: |
python3 -m pip install --upgrade maturin
maturin build --release -o dist --target $RUST_MUSL_CROSS_TARGET --features unwind
maturin build --release -o dist --target ${{ matrix.target }} --features unwind
Comment on lines -104 to +110
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Now that the tag matches the target, we can just use it directly which is a little clearer for someone not familiar with the container environment.

maturin sdist -o dist
if: matrix.target == 'x86_64-musl'
if: matrix.target == 'x86_64-unknown-linux-musl'
- name: Build
run: |
python3 -m pip install --upgrade maturin
maturin build --release -o dist --target $RUST_MUSL_CROSS_TARGET
maturin build --release -o dist --target ${{ matrix.target }}
maturin sdist -o dist
if: matrix.target != 'x86_64-musl'
if: matrix.target != 'x86_64-unknown-linux-musl'
- name: Rename Wheels
run: |
python3 -c "import shutil; import glob; wheels = glob.glob('dist/*.whl'); [shutil.move(wheel, wheel.replace('py3', 'py2.py3')) for wheel in wheels if 'py2' not in wheel]"
Expand Down
Loading