Merge pull request 'Adopt shared ci-actions for publishing' (#66 ) from ci/shared-actions into main

Reviewed-on: https://home.schmelczer.dev/git/git/andras/reconcile/pulls/66
Adopt shared ci-actions for publishing
2026-06-06 15:19:23 +01:00 · 2026-06-06 14:58:36 +01:00 · 2026-06-03 20:42:51 +01:00 · 2026-05-31 22:31:39 +01:00 · 2026-05-31 22:31:18 +01:00
11 changed files with 50 additions and 17 deletions
--- a/.forgejo/workflows/publish.yml
+++ b/.forgejo/workflows/publish.yml
@ -79,9 +79,10 @@ jobs:
      - name: Deploy to pages mount
        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        run: |
+        uses: http://forgejo:3000/andras/ci-actions/deploy-pages@main
-          apt-get update && apt-get install -y rsync
+        with:
-          rsync -a --delete examples/website/dist/ /pages/reconcile
+          source: examples/website/dist
          target: reconcile
  publish-crate:
    needs: build
--- a/Cargo.lock
+++ b/Cargo.lock
@ -428,7 +428,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
 [[package]]
 name = "reconcile-text"
-version = "0.12.0"
+version = "0.12.1"
 dependencies = [
 "console_error_panic_hook",
 "diff-match-patch-rs",
--- 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.0"
+version = "0.12.1"
 rust-version = "1.94"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
--- a/examples/website/package-lock.json
+++ b/examples/website/package-lock.json
@ -28,7 +28,7 @@
    },
    "../../reconcile-js": {
      "name": "reconcile-text",
-      "version": "0.12.0",
+      "version": "0.12.1",
      "dev": true,
      "license": "MIT",
      "devDependencies": {
--- a/examples/website/src/index.html
+++ b/examples/website/src/index.html
@ -26,7 +26,7 @@
    <link inline inline-asset="index.css" inline-asset-delete />
    <script
      defer
-      data-domain="reconcile"
+      data-domain="schmelczer.dev/reconcile"
      data-api="https://stats.schmelczer.dev/status"
      src="https://stats.schmelczer.dev/js/script.outbound-links.js"
    ></script>
--- a/reconcile-js/package-lock.json
+++ b/reconcile-js/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "reconcile-text",
-  "version": "0.12.0",
+  "version": "0.12.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "reconcile-text",
-      "version": "0.12.0",
+      "version": "0.12.1",
      "license": "MIT",
      "devDependencies": {
        "@types/jest": "^30.0.0",
@ -25,7 +25,7 @@
    },
    "../pkg": {
      "name": "reconcile-text",
-      "version": "0.12.0",
+      "version": "0.12.1",
      "dev": true,
      "license": "MIT"
    },
--- a/reconcile-js/package.json
+++ b/reconcile-js/package.json
@ -1,6 +1,6 @@
 {
  "name": "reconcile-text",
-  "version": "0.12.0",
+  "version": "0.12.1",
  "description": "Intelligent 3-way text merging with automated conflict resolution",
  "main": "dist/reconcile.node.js",
  "browser": "dist/reconcile.web.js",
--- a/reconcile-python/Cargo.lock
+++ b/reconcile-python/Cargo.lock
@ -2,6 +2,22 @@
 # 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"
@ -55,6 +71,7 @@ version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bf94ee265674bf76c09fa430b0e99c26e319c945d96ca0d5a8215f31bf81cf7"
 dependencies = [
 "python3-dll-a",
 "target-lexicon",
 ]
@ -93,6 +110,15 @@ 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"
@ -104,19 +130,25 @@ dependencies = [
 [[package]]
 name = "reconcile-text"
-version = "0.12.0"
+version = "0.12.1"
 dependencies = [
 "thiserror",
 ]
 [[package]]
 name = "reconcile-text-python"
-version = "0.12.0"
+version = "0.12.1"
 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"
--- a/reconcile-python/Cargo.toml
+++ b/reconcile-python/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "reconcile-text-python"
-version = "0.12.0"
+version = "0.12.1"
 edition = "2024"
 rust-version = "1.94"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
@ -13,4 +13,4 @@ crate-type = ["cdylib"]
 [dependencies]
 reconcile-text = { path = ".." }
-pyo3 = { version = "0.28.2", features = ["extension-module", "abi3-py39"] }
+pyo3 = { version = "0.28.2", features = ["extension-module", "abi3-py39", "generate-import-lib"] }
--- a/reconcile-python/pyproject.toml
+++ b/reconcile-python/pyproject.toml
@ -4,7 +4,7 @@ build-backend = "maturin"
 [project]
 name = "reconcile-text"
-version = "0.12.0"
+version = "0.12.1"
 description = "Intelligent 3-way text merging with automated conflict resolution"
 readme = "README.md"
 license = { text = "MIT" }
--- a/reconcile-python/uv.lock
+++ b/reconcile-python/uv.lock
@ -168,7 +168,7 @@ wheels = [
 [[package]]
 name = "reconcile-text"
-version = "0.12.0"
+version = "0.12.1"
 source = { editable = "." }
 [package.dev-dependencies]
Author	SHA1	Message	Date
Andras Schmelczer	08a656c6ed	Merge pull request 'Adopt shared ci-actions for publishing' (#66 ) from ci/shared-actions into main All checks were successful Check / build (push) Successful in 5m51s Details Publish / build (push) Successful in 8m43s Details Publish / publish-crate (push) Has been skipped Details Publish / publish-npm (push) Has been skipped Details Publish / publish-pypi (push) Has been skipped Details Reviewed-on: https://home.schmelczer.dev/git/git/andras/reconcile/pulls/66	2026-06-06 15:19:23 +01:00
Andras Schmelczer	adfc0ec868	Adopt shared ci-actions for publishing All checks were successful Check / build (pull_request) Successful in 5m44s Details Replace the inline publish step(s) with the canonical shell-only composite actions in andras/ci-actions (deploy-pages / docker-publish / forgejo-release). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-06 14:58:36 +01:00
Andras Schmelczer	56b40b358c	Update link All checks were successful Publish / build (push) Successful in 7m0s Details Publish / publish-crate (push) Has been skipped Details Publish / publish-npm (push) Has been skipped Details Publish / publish-pypi (push) Has been skipped Details Check / build (push) Successful in 7m56s Details	2026-06-03 20:42:51 +01:00
Andras Schmelczer	fcc856279c	Bump versions to 0.12.1 All checks were successful Check / build (push) Successful in 9m31s Details Publish / build (push) Successful in 9m53s Details Publish / publish-crate (push) Has been skipped Details Publish / publish-npm (push) Has been skipped Details Publish / publish-pypi (push) Successful in 6m53s Details	2026-05-31 22:31:39 +01:00
Andras Schmelczer	fd3a374b0f	Fix windows build Some checks failed Publish / publish-crate (push) Blocked by required conditions Details Publish / publish-npm (push) Blocked by required conditions Details Publish / publish-pypi (push) Blocked by required conditions Details Check / build (push) Has been cancelled Details Publish / build (push) Has been cancelled Details	2026-05-31 22:31:18 +01:00