From b48127bbba207387bf042f7447de5b5e9e9f11f2 Mon Sep 17 00:00:00 2001 From: Alexandre Pasmantier Date: Thu, 20 Mar 2025 19:56:44 +0100 Subject: [PATCH] chore: bump to 0.11.1 --- .github/workflows/cd.yml | 8 +++++--- Cargo.lock | 19 +------------------ Cargo.toml | 24 +++++++++++++----------- 3 files changed, 19 insertions(+), 32 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index ee5e477..656f182 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -252,10 +252,12 @@ jobs: if [[ ${{ matrix.target }} == aarch64-unknown-linux-gnu ]]; then sudo apt-get install -y --no-install-recommends gcc-aarch64-linux-gnu fi - cargo deb --profile deb --target ${{ matrix.target }} version="${{ github.ref_name }}" - echo "DEB_DIR=target/${{ matrix.target }}/debian" >> $GITHUB_ENV - echo "DEB_NAME=tv-$version-1_${{ matrix.arch }}.deb" >> $GITHUB_ENV + DEB_NAME="tv-$version-${{ matrix.arch }}.deb" + DEB_DIR="target/${{ matrix.target }}/debian" + cargo deb --profile deb --target ${{ matrix.target }} -o "$DEB_DIR/$DEB_NAME" + echo "DEB_DIR=$DEB_DIR" >> $GITHUB_ENV + echo "DEB_NAME=$DEB_NAME" >> $GITHUB_ENV - name: Create sha256 sum of deb file shell: bash diff --git a/Cargo.lock b/Cargo.lock index 2a78288..2d1ca28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1210,12 +1210,6 @@ dependencies = [ "libc", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.4.15" @@ -2186,14 +2180,12 @@ dependencies = [ "fnv", "once_cell", "onig", - "plist", "regex-syntax 0.8.5", "serde", "serde_derive", "serde_json", "thiserror 1.0.69", "walkdir", - "yaml-rust", ] [[package]] @@ -2217,7 +2209,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "television" -version = "0.11.0" +version = "0.11.1" dependencies = [ "anyhow", "base64", @@ -2900,15 +2892,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4de5f056fb9dc8b7908754867544e26145767187aaac5a98495e88ad7cb8a80f" -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "zerocopy" version = "0.8.23" diff --git a/Cargo.toml b/Cargo.toml index 6dab32d..3c4b27a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "television" -version = "0.11.0" +version = "0.11.1" edition = "2021" description = "A cross-platform, fast and extensible general purpose fuzzy finder TUI." license = "MIT" @@ -41,7 +41,6 @@ tokio = { version = "1.43", features = ["full"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } rustc-hash = "2.1" -syntect = { version = "5.2", default-features = false } unicode-width = "0.2" clap = { version = "4.5", features = ["derive", "cargo", "string"] } serde = { version = "1.0", features = ["derive"] } @@ -57,24 +56,18 @@ nom = "7.1" thiserror = "2.0" simdutf8 = { version = "0.1", optional = true } smallvec = { version = "1.13", features = ["const_generics"] } -bat = { version = "0.25", default-features = false, features = ["regex-onig"] } gag = "1.0" nucleo = "0.5" toml = "0.8" image = "0.25" +syntect = { package = "syntect", version = "5.2", default-features = false } +bat = { package = "bat", version = "0.25", default-features = false } [target.'cfg(windows)'.dependencies] winapi-util = "0.1.9" clipboard-win = "5.4.0" -# on arm64, use `syntect` with `fancy-regex` instead of `oniguruma` (build issues) -[target.'cfg(target_arch = "aarch64")'.dependencies] -syntect = { version = "5.2", default-features = false, features = [ - "default-fancy", -] } -bat = { version = "0.25", default-features = false, features = ["regex-fancy"] } - [dev-dependencies] criterion = { version = "0.5", features = ["async_tokio"] } tempfile = "3.16.0" @@ -82,7 +75,16 @@ tempfile = "3.16.0" [features] simd = ["dep:simdutf8"] zero-copy = [] -default = ["zero-copy", "simd"] +default = ["zero-copy", "simd", "onig"] +# Use fancy-regex for aarch64 Linux +fancy = ["syntect/regex-fancy", "bat/regex-fancy"] +# Use oniguruma for other platforms +onig = ["syntect/regex-onig", "bat/regex-onig"] + + +# Use `fancy-regex` instead of `oniguruma` on aarch64 Linux (build problems) +[target.'cfg(all(target_arch = "aarch64", target_os = "linux"))'.features] +default = ["fancy"] [build-dependencies]