From 7b8b0d3d3d57cb1af6a61a8c915f9673d820d84e Mon Sep 17 00:00:00 2001 From: Minoru OSUKA Date: Sun, 11 Jan 2026 00:02:19 +0900 Subject: [PATCH 1/2] Bump up version to 1.4.0 --- .github/workflows/periodic.yml | 11 ++++++--- .github/workflows/regression.yml | 11 ++++++--- .github/workflows/release.yml | 39 +++++++++++++++++++++----------- Cargo.toml | 32 +++++++++++++------------- Makefile | 8 +++---- README.md | 2 +- 6 files changed, 63 insertions(+), 40 deletions(-) diff --git a/.github/workflows/periodic.yml b/.github/workflows/periodic.yml index ea3ce57..c313463 100644 --- a/.github/workflows/periodic.yml +++ b/.github/workflows/periodic.yml @@ -37,12 +37,17 @@ jobs: platform: - runner: ubuntu-latest target: x86_64-unknown-linux-gnu - # - runner: macos-latest - # target: x86_64-apple-darwin + - runner: ubuntu-24.04-arm + target: aarch64-unknown-linux-gnu - runner: macos-latest target: aarch64-apple-darwin + - runner: macos-15-intel + target: x86_64-apple-darwin - runner: windows-latest target: x86_64-pc-windows-msvc + - runner: windows-latest + target: aarch64-pc-windows-msvc + skip_test_run: true toolchain: [stable, beta, nightly] runs-on: ${{ matrix.platform.runner }} env: @@ -59,4 +64,4 @@ jobs: components: rustfmt, clippy - name: Run test - run: cargo test --target "${{ matrix.platform.target }}" --all-features + run: cargo test --target "${{ matrix.platform.target }}" --all-features ${{ matrix.platform.skip_test_run == true && '--no-run' || '' }} diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 946b7fb..c80a5b1 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -40,12 +40,17 @@ jobs: platform: - runner: ubuntu-latest target: x86_64-unknown-linux-gnu - # - runner: macos-latest - # target: x86_64-apple-darwin + - runner: ubuntu-24.04-arm + target: aarch64-unknown-linux-gnu - runner: macos-latest target: aarch64-apple-darwin + - runner: macos-15-intel + target: x86_64-apple-darwin - runner: windows-latest target: x86_64-pc-windows-msvc + - runner: windows-latest + target: aarch64-pc-windows-msvc + skip_test_run: true toolchain: [stable] runs-on: ${{ matrix.platform.runner }} env: @@ -62,4 +67,4 @@ jobs: components: rustfmt, clippy - name: Run test - run: cargo test --target "${{ matrix.platform.target }}" --all-features + run: cargo test --target "${{ matrix.platform.target }}" --all-features ${{ matrix.platform.skip_test_run == true && '--no-run' || '' }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 99072c6..a608f22 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,12 +42,17 @@ jobs: platform: - runner: ubuntu-latest target: x86_64-unknown-linux-gnu - # - runner: macOS-latest - # target: x86_64-apple-darwin - - runner: macOS-latest + - runner: ubuntu-24.04-arm + target: aarch64-unknown-linux-gnu + - runner: macos-latest target: aarch64-apple-darwin + - runner: macos-15-intel + target: x86_64-apple-darwin - runner: windows-latest target: x86_64-pc-windows-msvc + - runner: windows-latest + target: aarch64-pc-windows-msvc + skip_test_run: true toolchain: [stable] features: ["cjk"] runs-on: ${{ matrix.platform.runner }} @@ -65,7 +70,7 @@ jobs: components: rustfmt, clippy - name: Run test - run: cargo test --target "${{ matrix.platform.target }}" --all-features + run: cargo test --target "${{ matrix.platform.target }}" --all-features ${{ matrix.platform.skip_test_run == true && '--no-run' || '' }} build: name: Build @@ -77,33 +82,41 @@ jobs: target: x86_64-unknown-linux-gnu archive: .zip extension: ".so" - # - runner: macos-latest - # target: x86_64-apple-darwin - # archive: .zip - # extension: ".dylib" + - runner: ubuntu-24.04-arm + target: aarch64-unknown-linux-gnu + archive: .zip + extension: ".so" - runner: macos-latest target: aarch64-apple-darwin archive: .zip extension: ".dylib" + - runner: macos-15-intel + target: x86_64-apple-darwin + archive: .zip + extension: ".dylib" - runner: windows-latest target: x86_64-pc-windows-msvc archive: .zip extension: ".dll" + - runner: windows-latest + target: aarch64-pc-windows-msvc + archive: .zip + extension: ".dll" toolchain: [stable] features: - - value: "embedded-ipadic" + - value: "embed-ipadic" package_name: "lindera-sqlite-ipadic" package_description: "Python binding for Lindera with Japanese dictionary (IPADIC)" - - value: "embedded-unidic" + - value: "embed-unidic" package_name: "lindera-sqlite-unidic" package_description: "Python binding for Lindera with Japanese dictionary (Unidic)" - - value: "embedded-ko-dic" + - value: "embed-ko-dic" package_name: "lindera-sqlite-ko-dic" package_description: "Python binding for Lindera with Korean dictionary (ko-dic)" - - value: "embedded-cc-cedict" + - value: "embed-cc-cedict" package_name: "lindera-sqlite-cc-cedict" package_description: "Python binding for Lindera with CHinese dictionary (CC-CEDICT)" - - value: "embedded-cjk" + - value: "embed-cjk" package_name: "lindera-sqlite" package_description: "Python binding for Lindera with CJK dictionaries (IPADIC, ko-dic, CC-CEDICT)" runs-on: ${{ matrix.platform.runner }} diff --git a/Cargo.toml b/Cargo.toml index 61729d0..4a4fb26 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lindera-sqlite" -version = "1.3.1" +version = "1.4.0" edition = "2024" description = "Lindera tokenizer for SQLite FTS5 extention" documentation = "https://docs.rs/lindera-sqlite" @@ -12,23 +12,23 @@ categories = ["text-processing"] license = "MIT" [features] -embedded-ipadic = [ - "lindera/embedded-ipadic", +embed-ipadic = [ + "lindera/embed-ipadic", ] # Include Japanese dictionary (IPADIC) -embedded-ipadic-neologd = [ - "lindera/embedded-ipadic-neologd", +embed-ipadic-neologd = [ + "lindera/embed-ipadic-neologd", ] # Include Japanese dictionary (IPADIC NEologd) -embedded-unidic = [ - "lindera/embedded-unidic", +embed-unidic = [ + "lindera/embed-unidic", ] # Include Japanese dictionary (UniDic) -embedded-ko-dic = [ - "lindera/embedded-ko-dic", +embed-ko-dic = [ + "lindera/embed-ko-dic", ] # Include Korean dictionary (ko-dic) -embedded-cc-cedict = [ - "lindera/embedded-cc-cedict", +embed-cc-cedict = [ + "lindera/embed-cc-cedict", ] # Include Chinese dictionary (CC-CEDICT) -embedded-cjk = [ - "lindera/embedded-cjk", +embed-cjk = [ + "lindera/embed-cjk", ] # Include CJK dictionary (Chinese, Japanese, Korean) extension = [] default = ["extension"] # No directories included @@ -46,14 +46,14 @@ panic = "abort" # Abort on panic for smaller binary and faster code [dependencies] # libc without `std` -libc = { version = "0.2.179", default-features = false, features = [] } -serde_json = "1.0.148" +libc = { version = "0.2.180", default-features = false, features = [] } +serde_json = "1.0.149" sqlite-loadable = "0.0.5" sqlite3ext-sys = "0.0.1" unicode-segmentation = "1.12.0" unicode-normalization = "0.1.25" -lindera = "1.5.1" +lindera = "2.0.1" [dev-dependencies] criterion = "0.8.1" diff --git a/Makefile b/Makefile index e68301a..e76b765 100644 --- a/Makefile +++ b/Makefile @@ -13,16 +13,16 @@ format: ## Format the code cargo fmt lint: ## Run linter - cargo clippy --features=embedded-cjk + cargo clippy --features=embed-cjk build: ## Build the project - cargo build --release --features=embedded-cjk + cargo build --release --features=embed-cjk test: ## Run tests - LINDERA_CONFIG_PATH=./resources/lindera.yml cargo test --features=embedded-cjk + LINDERA_CONFIG_PATH=./resources/lindera.yml cargo test --features=embed-cjk bench: ## Run benchmarks - LINDERA_CONFIG_PATH=./resources/lindera.yml cargo bench --features=embedded-cjk + LINDERA_CONFIG_PATH=./resources/lindera.yml cargo bench --features=embed-cjk tag: ## Make a new tag for the current version git tag v$(LINDERA_SQLITE_VERSION) diff --git a/README.md b/README.md index 9904054..8c37f41 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ When used as a custom FTS5 tokenizer this enables application to support Chinese ## Build extension ```sh -% cargo build --features=embedded-cjk +% cargo build --features=embed-cjk ``` ## Set enviromment variable for Lindera configuration From 829c09e493e29ae9cd972680f2e621a3f5d019a9 Mon Sep 17 00:00:00 2001 From: Minoru OSUKA Date: Sun, 11 Jan 2026 00:14:06 +0900 Subject: [PATCH 2/2] Update sqlite-loadable --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4a4fb26..ca9a404 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ panic = "abort" # Abort on panic for smaller binary and faster code # libc without `std` libc = { version = "0.2.180", default-features = false, features = [] } serde_json = "1.0.149" -sqlite-loadable = "0.0.5" +sqlite-loadable = "0.0.6-alpha.6" sqlite3ext-sys = "0.0.1" unicode-segmentation = "1.12.0" unicode-normalization = "0.1.25"