Skip to content

Commit bf9ae2b

Browse files
authored
Merge pull request #33 from lindera/bump
Bump up version to 1.4.0
2 parents b915141 + 829c09e commit bf9ae2b

File tree

6 files changed

+64
-41
lines changed

6 files changed

+64
-41
lines changed

.github/workflows/periodic.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,17 @@ jobs:
3737
platform:
3838
- runner: ubuntu-latest
3939
target: x86_64-unknown-linux-gnu
40-
# - runner: macos-latest
41-
# target: x86_64-apple-darwin
40+
- runner: ubuntu-24.04-arm
41+
target: aarch64-unknown-linux-gnu
4242
- runner: macos-latest
4343
target: aarch64-apple-darwin
44+
- runner: macos-15-intel
45+
target: x86_64-apple-darwin
4446
- runner: windows-latest
4547
target: x86_64-pc-windows-msvc
48+
- runner: windows-latest
49+
target: aarch64-pc-windows-msvc
50+
skip_test_run: true
4651
toolchain: [stable, beta, nightly]
4752
runs-on: ${{ matrix.platform.runner }}
4853
env:
@@ -59,4 +64,4 @@ jobs:
5964
components: rustfmt, clippy
6065

6166
- name: Run test
62-
run: cargo test --target "${{ matrix.platform.target }}" --all-features
67+
run: cargo test --target "${{ matrix.platform.target }}" --all-features ${{ matrix.platform.skip_test_run == true && '--no-run' || '' }}

.github/workflows/regression.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,17 @@ jobs:
4040
platform:
4141
- runner: ubuntu-latest
4242
target: x86_64-unknown-linux-gnu
43-
# - runner: macos-latest
44-
# target: x86_64-apple-darwin
43+
- runner: ubuntu-24.04-arm
44+
target: aarch64-unknown-linux-gnu
4545
- runner: macos-latest
4646
target: aarch64-apple-darwin
47+
- runner: macos-15-intel
48+
target: x86_64-apple-darwin
4749
- runner: windows-latest
4850
target: x86_64-pc-windows-msvc
51+
- runner: windows-latest
52+
target: aarch64-pc-windows-msvc
53+
skip_test_run: true
4954
toolchain: [stable]
5055
runs-on: ${{ matrix.platform.runner }}
5156
env:
@@ -62,4 +67,4 @@ jobs:
6267
components: rustfmt, clippy
6368

6469
- name: Run test
65-
run: cargo test --target "${{ matrix.platform.target }}" --all-features
70+
run: cargo test --target "${{ matrix.platform.target }}" --all-features ${{ matrix.platform.skip_test_run == true && '--no-run' || '' }}

.github/workflows/release.yml

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,17 @@ jobs:
4242
platform:
4343
- runner: ubuntu-latest
4444
target: x86_64-unknown-linux-gnu
45-
# - runner: macOS-latest
46-
# target: x86_64-apple-darwin
47-
- runner: macOS-latest
45+
- runner: ubuntu-24.04-arm
46+
target: aarch64-unknown-linux-gnu
47+
- runner: macos-latest
4848
target: aarch64-apple-darwin
49+
- runner: macos-15-intel
50+
target: x86_64-apple-darwin
4951
- runner: windows-latest
5052
target: x86_64-pc-windows-msvc
53+
- runner: windows-latest
54+
target: aarch64-pc-windows-msvc
55+
skip_test_run: true
5156
toolchain: [stable]
5257
features: ["cjk"]
5358
runs-on: ${{ matrix.platform.runner }}
@@ -65,7 +70,7 @@ jobs:
6570
components: rustfmt, clippy
6671

6772
- name: Run test
68-
run: cargo test --target "${{ matrix.platform.target }}" --all-features
73+
run: cargo test --target "${{ matrix.platform.target }}" --all-features ${{ matrix.platform.skip_test_run == true && '--no-run' || '' }}
6974

7075
build:
7176
name: Build
@@ -77,33 +82,41 @@ jobs:
7782
target: x86_64-unknown-linux-gnu
7883
archive: .zip
7984
extension: ".so"
80-
# - runner: macos-latest
81-
# target: x86_64-apple-darwin
82-
# archive: .zip
83-
# extension: ".dylib"
85+
- runner: ubuntu-24.04-arm
86+
target: aarch64-unknown-linux-gnu
87+
archive: .zip
88+
extension: ".so"
8489
- runner: macos-latest
8590
target: aarch64-apple-darwin
8691
archive: .zip
8792
extension: ".dylib"
93+
- runner: macos-15-intel
94+
target: x86_64-apple-darwin
95+
archive: .zip
96+
extension: ".dylib"
8897
- runner: windows-latest
8998
target: x86_64-pc-windows-msvc
9099
archive: .zip
91100
extension: ".dll"
101+
- runner: windows-latest
102+
target: aarch64-pc-windows-msvc
103+
archive: .zip
104+
extension: ".dll"
92105
toolchain: [stable]
93106
features:
94-
- value: "embedded-ipadic"
107+
- value: "embed-ipadic"
95108
package_name: "lindera-sqlite-ipadic"
96109
package_description: "Python binding for Lindera with Japanese dictionary (IPADIC)"
97-
- value: "embedded-unidic"
110+
- value: "embed-unidic"
98111
package_name: "lindera-sqlite-unidic"
99112
package_description: "Python binding for Lindera with Japanese dictionary (Unidic)"
100-
- value: "embedded-ko-dic"
113+
- value: "embed-ko-dic"
101114
package_name: "lindera-sqlite-ko-dic"
102115
package_description: "Python binding for Lindera with Korean dictionary (ko-dic)"
103-
- value: "embedded-cc-cedict"
116+
- value: "embed-cc-cedict"
104117
package_name: "lindera-sqlite-cc-cedict"
105118
package_description: "Python binding for Lindera with CHinese dictionary (CC-CEDICT)"
106-
- value: "embedded-cjk"
119+
- value: "embed-cjk"
107120
package_name: "lindera-sqlite"
108121
package_description: "Python binding for Lindera with CJK dictionaries (IPADIC, ko-dic, CC-CEDICT)"
109122
runs-on: ${{ matrix.platform.runner }}

Cargo.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "lindera-sqlite"
3-
version = "1.3.1"
3+
version = "1.4.0"
44
edition = "2024"
55
description = "Lindera tokenizer for SQLite FTS5 extention"
66
documentation = "https://docs.rs/lindera-sqlite"
@@ -12,23 +12,23 @@ categories = ["text-processing"]
1212
license = "MIT"
1313

1414
[features]
15-
embedded-ipadic = [
16-
"lindera/embedded-ipadic",
15+
embed-ipadic = [
16+
"lindera/embed-ipadic",
1717
] # Include Japanese dictionary (IPADIC)
18-
embedded-ipadic-neologd = [
19-
"lindera/embedded-ipadic-neologd",
18+
embed-ipadic-neologd = [
19+
"lindera/embed-ipadic-neologd",
2020
] # Include Japanese dictionary (IPADIC NEologd)
21-
embedded-unidic = [
22-
"lindera/embedded-unidic",
21+
embed-unidic = [
22+
"lindera/embed-unidic",
2323
] # Include Japanese dictionary (UniDic)
24-
embedded-ko-dic = [
25-
"lindera/embedded-ko-dic",
24+
embed-ko-dic = [
25+
"lindera/embed-ko-dic",
2626
] # Include Korean dictionary (ko-dic)
27-
embedded-cc-cedict = [
28-
"lindera/embedded-cc-cedict",
27+
embed-cc-cedict = [
28+
"lindera/embed-cc-cedict",
2929
] # Include Chinese dictionary (CC-CEDICT)
30-
embedded-cjk = [
31-
"lindera/embedded-cjk",
30+
embed-cjk = [
31+
"lindera/embed-cjk",
3232
] # Include CJK dictionary (Chinese, Japanese, Korean)
3333
extension = []
3434
default = ["extension"] # No directories included
@@ -46,14 +46,14 @@ panic = "abort" # Abort on panic for smaller binary and faster code
4646

4747
[dependencies]
4848
# libc without `std`
49-
libc = { version = "0.2.179", default-features = false, features = [] }
50-
serde_json = "1.0.148"
51-
sqlite-loadable = "0.0.5"
49+
libc = { version = "0.2.180", default-features = false, features = [] }
50+
serde_json = "1.0.149"
51+
sqlite-loadable = "0.0.6-alpha.6"
5252
sqlite3ext-sys = "0.0.1"
5353
unicode-segmentation = "1.12.0"
5454
unicode-normalization = "0.1.25"
5555

56-
lindera = "1.5.1"
56+
lindera = "2.0.1"
5757

5858
[dev-dependencies]
5959
criterion = "0.8.1"

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ format: ## Format the code
1313
cargo fmt
1414

1515
lint: ## Run linter
16-
cargo clippy --features=embedded-cjk
16+
cargo clippy --features=embed-cjk
1717

1818
build: ## Build the project
19-
cargo build --release --features=embedded-cjk
19+
cargo build --release --features=embed-cjk
2020

2121
test: ## Run tests
22-
LINDERA_CONFIG_PATH=./resources/lindera.yml cargo test --features=embedded-cjk
22+
LINDERA_CONFIG_PATH=./resources/lindera.yml cargo test --features=embed-cjk
2323

2424
bench: ## Run benchmarks
25-
LINDERA_CONFIG_PATH=./resources/lindera.yml cargo bench --features=embedded-cjk
25+
LINDERA_CONFIG_PATH=./resources/lindera.yml cargo bench --features=embed-cjk
2626

2727
tag: ## Make a new tag for the current version
2828
git tag v$(LINDERA_SQLITE_VERSION)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ When used as a custom FTS5 tokenizer this enables application to support Chinese
77
## Build extension
88

99
```sh
10-
% cargo build --features=embedded-cjk
10+
% cargo build --features=embed-cjk
1111
```
1212

1313
## Set enviromment variable for Lindera configuration

0 commit comments

Comments
 (0)