Ensure readme version is up-to-date

This commit is contained in:
Andras Schmelczer 2026-10-27 21:09:59 +00:00
commit e0a0ed9262
3 changed files with 18 additions and 10 deletions

View file

@ -18,7 +18,7 @@ For the motivation and algorithm behind the library, read [Conflict-Free Three-W
- **No conflict markers** - Clean, merged output without Git's `<<<<<<<` markers - **No conflict markers** - Clean, merged output without Git's `<<<<<<<` markers
- **Cursor tracking** - Automatically repositions cursors and selections throughout the merging process - **Cursor tracking** - Automatically repositions cursors and selections throughout the merging process
- **Flexible tokenisation** - Word-level (default), character-level, line-level, or custom tokenisation strategies - **Flexible tokenisation** - Word-level (default), character-level, line-level, Markdown-aware, or custom tokenisation strategies
- **Unicode support** - Full UTF-8 support with proper handling of complex scripts and grapheme clusters - **Unicode support** - Full UTF-8 support with proper handling of complex scripts and grapheme clusters
- **Cross-platform** - Native Rust performance with WebAssembly bindings for JavaScript and native bindings for Python - **Cross-platform** - Native Rust performance with WebAssembly bindings for JavaScript and native bindings for Python
@ -36,7 +36,7 @@ Alternatively, add `reconcile-text` to your `Cargo.toml`:
```toml ```toml
[dependencies] [dependencies]
reconcile-text = "0.8" reconcile-text = "0.13.2"
``` ```
Then start merging: Then start merging:
@ -220,7 +220,7 @@ Install [rustup][26]:
### Scripts ### Scripts
- **Run tests**: `scripts/test.sh` - **Run tests**: `scripts/test.sh`
- **Lint and format**: `scripts/lint.sh` - **Check lint and formatting**: `scripts/lint.sh`
- **Develop demo website**: `scripts/dev-website.sh` - **Develop demo website**: `scripts/dev-website.sh`
- **Build demo website**: `scripts/build-website.sh` - **Build demo website**: `scripts/build-website.sh`
- **Publish new version**: `scripts/bump-version.sh patch` - **Publish new version**: `scripts/bump-version.sh patch`

View file

@ -38,6 +38,9 @@ echo "Bumping versions"
which cargo-set-version || cargo install cargo-edit which cargo-set-version || cargo install cargo-edit
cargo set-version --bump $1 cargo set-version --bump $1
NEWVER=$(grep '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
sed_inplace "s/^reconcile-text = \".*\"/reconcile-text = \"$NEWVER\"/" README.md
which wasm-pack || cargo install wasm-pack which wasm-pack || cargo install wasm-pack
wasm-pack build --target web --features wasm wasm-pack build --target web --features wasm
@ -46,7 +49,6 @@ cd reconcile-js
npm version $1 npm version $1
npm install npm install
NEWVER=$(grep '^version = ' ../Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
cd ../reconcile-python cd ../reconcile-python
sed_inplace "s/^version = \".*\"/version = \"$NEWVER\"/" Cargo.toml sed_inplace "s/^version = \".*\"/version = \"$NEWVER\"/" Cargo.toml
sed_inplace "s/^version = \".*\"/version = \"$NEWVER\"/" pyproject.toml sed_inplace "s/^version = \".*\"/version = \"$NEWVER\"/" pyproject.toml

View file

@ -2,25 +2,31 @@
set -e set -e
VERSION=$(grep '^version = ' Cargo.toml | head -1 | sed 's/version = "\(.*\)"/\1/')
if ! grep -Fxq "reconcile-text = \"$VERSION\"" README.md; then
echo "README.md must use the Cargo.toml version ($VERSION) in the Rust installation example."
exit 1
fi
which cargo-machete || cargo install cargo-machete which cargo-machete || cargo install cargo-machete
cargo machete cargo machete
cargo clippy --all-targets --all-features --fix --allow-dirty --allow-staged cargo clippy --all-targets --all-features -- -D warnings
cargo fmt --all cargo fmt --all -- --check
cd reconcile-js cd reconcile-js
npm ci npm ci
npm run format npm run format:check
cd ../examples/website cd ../examples/website
npm ci npm ci
npm run format npm run format:check
cd ../../reconcile-python cd ../../reconcile-python
cp ../README.md . cp ../README.md ../LICENSE .
uv run maturin develop -q uv run maturin develop -q
uv run ruff check python/ tests/ uv run ruff check python/ tests/
uv run ruff format python/ tests/ uv run ruff format --check python/ tests/
uv run pyright python/ tests/ uv run pyright python/ tests/
cd - cd -