diff --git a/.forgejo/workflows/publish.yml b/.forgejo/workflows/publish.yml index 3aea1ae..bbaf253 100644 --- a/.forgejo/workflows/publish.yml +++ b/.forgejo/workflows/publish.yml @@ -79,10 +79,9 @@ jobs: - name: Deploy to pages mount if: github.event_name == 'push' && github.ref == 'refs/heads/main' - uses: http://forgejo:3000/andras/ci-actions/deploy-pages@main - with: - source: examples/website/dist - target: reconcile + run: | + apt-get update && apt-get install -y rsync + rsync -a --delete examples/website/dist/ /pages/reconcile publish-crate: needs: build diff --git a/Cargo.lock b/Cargo.lock index 0971f12..b371452 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -428,7 +428,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "reconcile-text" -version = "0.12.1" +version = "0.12.0" dependencies = [ "console_error_panic_hook", "diff-match-patch-rs", diff --git a/Cargo.toml b/Cargo.toml index 21ff69b..5e60f78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "reconcile-text" description = "Intelligent 3-way text merging with automated conflict resolution" -version = "0.12.1" +version = "0.12.0" rust-version = "1.94" authors = ["Andras Schmelczer "] edition = "2024" diff --git a/examples/website/package-lock.json b/examples/website/package-lock.json index cfab4c3..a9369d7 100644 --- a/examples/website/package-lock.json +++ b/examples/website/package-lock.json @@ -28,7 +28,7 @@ }, "../../reconcile-js": { "name": "reconcile-text", - "version": "0.12.1", + "version": "0.12.0", "dev": true, "license": "MIT", "devDependencies": { diff --git a/examples/website/src/index.html b/examples/website/src/index.html index e6b98c3..4519472 100644 --- a/examples/website/src/index.html +++ b/examples/website/src/index.html @@ -26,7 +26,7 @@ diff --git a/reconcile-js/package-lock.json b/reconcile-js/package-lock.json index 397ff47..b1a50b6 100644 --- a/reconcile-js/package-lock.json +++ b/reconcile-js/package-lock.json @@ -1,12 +1,12 @@ { "name": "reconcile-text", - "version": "0.12.1", + "version": "0.12.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "reconcile-text", - "version": "0.12.1", + "version": "0.12.0", "license": "MIT", "devDependencies": { "@types/jest": "^30.0.0", @@ -25,7 +25,7 @@ }, "../pkg": { "name": "reconcile-text", - "version": "0.12.1", + "version": "0.12.0", "dev": true, "license": "MIT" }, diff --git a/reconcile-js/package.json b/reconcile-js/package.json index 7bf8edf..da3a0ce 100644 --- a/reconcile-js/package.json +++ b/reconcile-js/package.json @@ -1,6 +1,6 @@ { "name": "reconcile-text", - "version": "0.12.1", + "version": "0.12.0", "description": "Intelligent 3-way text merging with automated conflict resolution", "main": "dist/reconcile.node.js", "browser": "dist/reconcile.web.js", diff --git a/reconcile-python/Cargo.lock b/reconcile-python/Cargo.lock index 1ea367b..07e6da6 100644 --- a/reconcile-python/Cargo.lock +++ b/reconcile-python/Cargo.lock @@ -2,22 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "cc" -version = "1.2.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f" -dependencies = [ - "find-msvc-tools", - "shlex", -] - -[[package]] -name = "find-msvc-tools" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" - [[package]] name = "heck" version = "0.5.0" @@ -71,7 +55,6 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf94ee265674bf76c09fa430b0e99c26e319c945d96ca0d5a8215f31bf81cf7" dependencies = [ - "python3-dll-a", "target-lexicon", ] @@ -110,15 +93,6 @@ dependencies = [ "syn", ] -[[package]] -name = "python3-dll-a" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80ba7540edb18890d444c5aa8e1f1f99b1bdf26fb26ae383135325f4a36042b" -dependencies = [ - "cc", -] - [[package]] name = "quote" version = "1.0.45" @@ -130,25 +104,19 @@ dependencies = [ [[package]] name = "reconcile-text" -version = "0.12.1" +version = "0.12.0" dependencies = [ "thiserror", ] [[package]] name = "reconcile-text-python" -version = "0.12.1" +version = "0.12.0" dependencies = [ "pyo3", "reconcile-text", ] -[[package]] -name = "shlex" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" - [[package]] name = "syn" version = "2.0.117" diff --git a/reconcile-python/Cargo.toml b/reconcile-python/Cargo.toml index 37facf0..0ecdbf6 100644 --- a/reconcile-python/Cargo.toml +++ b/reconcile-python/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "reconcile-text-python" -version = "0.12.1" +version = "0.12.0" edition = "2024" rust-version = "1.94" authors = ["Andras Schmelczer "] @@ -13,4 +13,4 @@ crate-type = ["cdylib"] [dependencies] reconcile-text = { path = ".." } -pyo3 = { version = "0.28.2", features = ["extension-module", "abi3-py39", "generate-import-lib"] } +pyo3 = { version = "0.28.2", features = ["extension-module", "abi3-py39"] } diff --git a/reconcile-python/pyproject.toml b/reconcile-python/pyproject.toml index b3b16e7..ba367f2 100644 --- a/reconcile-python/pyproject.toml +++ b/reconcile-python/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "maturin" [project] name = "reconcile-text" -version = "0.12.1" +version = "0.12.0" description = "Intelligent 3-way text merging with automated conflict resolution" readme = "README.md" license = { text = "MIT" } diff --git a/reconcile-python/uv.lock b/reconcile-python/uv.lock index 6e5156f..8a3d3a4 100644 --- a/reconcile-python/uv.lock +++ b/reconcile-python/uv.lock @@ -168,7 +168,7 @@ wheels = [ [[package]] name = "reconcile-text" -version = "0.12.1" +version = "0.12.0" source = { editable = "." } [package.dev-dependencies]