Skip to content

Commit

Permalink
Fix our xz2 crate configuration to enable static linking. (#173)
Browse files Browse the repository at this point in the history
Previously liblzma was dynamically linked (to a homebrew version).

Fixes #172
  • Loading branch information
jsirois authored Nov 23, 2023
1 parent 0be4551 commit eed2a6d
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 9 deletions.
10 changes: 6 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ jobs:
resource_class: arm.medium
steps:
- checkout
- rust/install:
version: nightly
- rust/format:
nightly-toolchain: true
# TODO(John Sirois): https://github.com/a-scie/jump/issues/174
# Undo once https://github.com/rust-lang/rustfmt/issues/5964 is fixed.
#- rust/install:
# version: nightly
#- rust/format:
# nightly-toolchain: true
- rust/install
- rust/clippy
- rust/test:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Check Formatting
# TODO(John Sirois): https://github.com/a-scie/jump/issues/174
# Undo once https://github.com/rust-lang/rustfmt/issues/5964 is fixed.
if: matrix.os != 'macos-13-aarch64'
run: |
rustup toolchain add nightly -c rustfmt
cargo +nightly fmt --check --all
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release Notes

## 0.13.3

Ensure liblzma is statically linked.

## 0.13.2

When `load_dotenv` is requested, propagate errors loading any `.env` file found.
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ members = [

[package]
name = "scie-jump"
version = "0.13.2"
version = "0.13.3"
description = "The self contained interpreted executable launcher."
authors = [
"John Sirois <[email protected]>",
Expand Down
4 changes: 2 additions & 2 deletions jump/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "jump"
version = "0.13.2"
version = "0.13.3"
description = "The bulk of the scie-jump binary logic."
authors = [
"John Sirois <[email protected]>",
Expand Down Expand Up @@ -30,7 +30,7 @@ structure = "0.1"
tar = "0.4"
tempfile = { workspace = true }
tuple = "0.5"
xz2 = "0.1"
xz2 = { version = "0.1", features = ["static"] }
zip = { workspace = true }
zstd = "0.12"
walkdir = "2.3"
Expand Down

0 comments on commit eed2a6d

Please sign in to comment.