Skip to content

Commit 579f386

Browse files
committed
Merge branch 'main' into data-symbol-diff
2 parents e87ea2c + 5d4b33a commit 579f386

File tree

20 files changed

+379
-240
lines changed

20 files changed

+379
-240
lines changed

.github/workflows/build.yaml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
- name: Cache Rust workspace
3737
uses: Swatinem/rust-cache@v2
3838
- name: Cargo check
39-
run: cargo check --all-targets --all-features
39+
run: cargo check --all-targets --all-features --workspace
4040
- name: Cargo clippy
41-
run: cargo clippy --all-targets --all-features
41+
run: cargo clippy --all-targets --all-features --workspace
4242

4343
fmt:
4444
name: Format
@@ -92,7 +92,7 @@ jobs:
9292
- name: Cache Rust workspace
9393
uses: Swatinem/rust-cache@v2
9494
- name: Cargo test
95-
run: cargo test --release --features all
95+
run: cargo test --release --all-features --workspace
9696

9797
build-cli:
9898
name: Build objdiff-cli
@@ -146,13 +146,14 @@ jobs:
146146
steps:
147147
- name: Checkout
148148
uses: actions/checkout@v4
149+
- name: Install uv
150+
if: matrix.build == 'zigbuild'
151+
uses: astral-sh/setup-uv@v6
149152
- name: Install cargo-zigbuild
150153
if: matrix.build == 'zigbuild'
151154
run: |
152-
python3 -m venv .venv
153-
. .venv/bin/activate
154-
echo PATH=$PATH >> $GITHUB_ENV
155-
pip install ziglang==0.13.0.post1 cargo-zigbuild==0.19.8
155+
uv tool install cargo-zigbuild==0.20.1 --with-executables-from ziglang==0.15.1
156+
echo "CARGO_ZIGBUILD_ZIG_PATH=$(uv tool dir)/cargo-zigbuild/bin/python-zig" >> $GITHUB_ENV
156157
- name: Setup Rust toolchain
157158
uses: dtolnay/rust-toolchain@stable
158159
with:
@@ -213,13 +214,14 @@ jobs:
213214
sudo apt-get -y install ${{ matrix.packages }}
214215
- name: Checkout
215216
uses: actions/checkout@v4
217+
- name: Install uv
218+
if: matrix.build == 'zigbuild'
219+
uses: astral-sh/setup-uv@v6
216220
- name: Install cargo-zigbuild
217221
if: matrix.build == 'zigbuild'
218222
run: |
219-
python3 -m venv .venv
220-
. .venv/bin/activate
221-
echo PATH=$PATH >> $GITHUB_ENV
222-
pip install ziglang==0.13.0.post1 cargo-zigbuild==0.19.8
223+
uv tool install cargo-zigbuild==0.20.1 --with-executables-from ziglang==0.15.1
224+
echo "CARGO_ZIGBUILD_ZIG_PATH=$(uv tool dir)/cargo-zigbuild/bin/python-zig" >> $GITHUB_ENV
223225
- name: Setup Rust toolchain
224226
uses: dtolnay/rust-toolchain@stable
225227
with:

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repos:
2424
description: Run cargo clippy on all project files.
2525
language: system
2626
entry: cargo
27-
args: ["+nightly", "clippy", "--all-targets", "--all-features"]
27+
args: ["+nightly", "clippy", "--all-targets", "--all-features", "--workspace"]
2828
pass_filenames: false
2929
- id: cargo-deny
3030
name: cargo deny

Cargo.lock

Lines changed: 25 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,28 @@ members = [
55
"objdiff-gui",
66
"objdiff-wasm",
77
]
8+
default-members = [
9+
"objdiff-cli",
10+
"objdiff-core",
11+
"objdiff-gui",
12+
# Exclude objdiff-wasm by default
13+
]
814
resolver = "3"
915

10-
[profile.release-lto]
11-
inherits = "release"
12-
lto = "fat"
13-
strip = "debuginfo"
14-
codegen-units = 1
15-
1616
[workspace.package]
17-
version = "3.0.0"
17+
version = "3.0.1"
1818
authors = ["Luke Street <[email protected]>"]
1919
edition = "2024"
2020
license = "MIT OR Apache-2.0"
2121
repository = "https://github.com/encounter/objdiff"
2222
rust-version = "1.88"
23+
24+
[profile.release-lto]
25+
inherits = "release"
26+
lto = "fat"
27+
strip = "debuginfo"
28+
codegen-units = 1
29+
30+
[profile.release-min]
31+
inherits = "release-lto"
32+
opt-level = "z"

0 commit comments

Comments
 (0)