Skip to content

Commit

Permalink
Move custom musl build instructions under generic cargo-dist configs.
Browse files Browse the repository at this point in the history
  • Loading branch information
KtorZ committed Oct 2, 2024
1 parent 31819fe commit 538181f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
7 changes: 4 additions & 3 deletions .github/musl-build-setup.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
- run: |
sudo apt-get install -y pkg-config libssl-dev musl musl-dev musl-tools
rustup target add x86_64-unknown-linux-musl
- if: ${{ runner.os == 'Linux' }}
run: |
sudo apt-get install -y pkg-config libssl-dev musl musl-dev musl-tools
rustup target add x86_64-unknown-linux-musl
19 changes: 9 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ install-updater = false
install-path = "~/.aiken/bin"
# Whether to publish prereleases to package managers
publish-prereleases = true
# Inject build steps into the build-local-artifacts job to prepare the container.
# This is needed to install libssl-dev and musl tools for producing statically linked
# binary on Linux and avoid weird segfaults.
#
# Note: should be a path relative to the .github/workflows/ directory, and
# which should point to a .yml file containing the github workflow steps just
# as one would normally write them in a workflow.
[workspace.metadata.dist]
github-build-setup = "../musl-build-setup.yml"

[[workspace.metadata.dist.artifact]]
target = "x86_64-unknown-linux-musl"
Expand All @@ -49,16 +58,6 @@ features = ["bundle_openssl"]
[workspace.metadata.dist.github-custom-runners]
x86_64-unknown-linux-musl = "ubuntu-22.04"

# Inject build steps into the build-local-artifacts job to prepare the container.
# This is needed to install libssl-dev and musl tools for producing statically linked
# binary on Linux and avoid weird segfaults.
#
# Note: should be a path relative to the .github/workflows/ directory, and
# which should point to a .yml file containing the github workflow steps just
# as one would normally write them in a workflow.
[workspace.metadata.dist.github-build-setup]
x86_64-unknown-linux-musl = "../musl-build-setup.yml"

[workspace.dependencies]
walkdir = "2.3.2"
insta = { version = "1.30.0", features = ["yaml", "json", "redactions"] }
Expand Down

0 comments on commit 538181f

Please sign in to comment.