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
14 changes: 4 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ jobs:
strategy:
matrix:
include:
- target: x86_64-unknown-linux-gnu
- target: x86_64-unknown-linux-musl
os: ubuntu-latest
- target: aarch64-unknown-linux-gnu
cross: true
- target: aarch64-unknown-linux-musl
os: ubuntu-latest
cross: true
- target: aarch64-apple-darwin
Expand All @@ -34,17 +35,10 @@ jobs:
if: matrix.cross
run: cargo install cross --git https://github.com/cross-rs/cross

- name: Install OpenSSL (native Linux)
if: runner.os == 'Linux' && !matrix.cross
run: sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config

- name: Build
run: |
if [ "${{ matrix.cross }}" = "true" ]; then
OPENSSL_STATIC=1 \
OPENSSL_INCLUDE_DIR=/usr/include/aarch64-linux-gnu \
OPENSSL_LIB_DIR=/usr/lib/aarch64-linux-gnu \
cross build --release --target ${{ matrix.target }}
cross build --release --target ${{ matrix.target }} --features vendored-openssl
else
cargo build --release --target ${{ matrix.target }}
fi
Expand Down
11 changes: 11 additions & 0 deletions Cargo.lock

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

16 changes: 10 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@ edition = "2024"
description = "Git hunk sifter for code agents"
license = "MIT"

[features]
vendored-openssl = ["openssl-sys"]

[dependencies]
git2 = "0.19"
clap = { version = "4", features = ["derive"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
anyhow = "1"
similar = { version = "2", features = ["text"] }
git2 = "0.19"
openssl-sys = { version = "0.9", features = ["vendored"], optional = true }
clap = { version = "4", features = ["derive"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
anyhow = "1"
similar = { version = "2", features = ["text"] }

[dev-dependencies]
assert_cmd = "2"
Expand Down
12 changes: 2 additions & 10 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
[target.aarch64-unknown-linux-gnu]
pre-build = [
"dpkg --add-architecture arm64",
"apt-get update && apt-get install -y libssl-dev:arm64"
]
[target.x86_64-unknown-linux-musl]

[target.aarch64-unknown-linux-gnu.env]
passthrough = [
"OPENSSL_INCLUDE_DIR",
"OPENSSL_LIB_DIR",
]
[target.aarch64-unknown-linux-musl]
Loading