From da1c78e5bf645a5c950a9abfe7c12dfa2768a1fc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 03:40:07 +0000 Subject: [PATCH 1/4] Bump actions/checkout from 4 to 5 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check.yml | 6 +++--- .github/workflows/gh-pages.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 703de43..bcc5fda 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Setup Node.js environment uses: actions/setup-node@v4.4.0 @@ -61,7 +61,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Cache Rust dependencies uses: actions/cache@v4 @@ -85,7 +85,7 @@ jobs: if: startsWith(github.ref, 'refs/tags/') steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Setup Node.js environment uses: actions/setup-node@v4.4.0 diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 864ecb9..4382698 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -25,7 +25,7 @@ jobs: contents: write steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Cache Rust dependencies uses: actions/cache@v4 -- 2.47.2 From 6b2aaa032835f85ef4d601822cd57c0c6a7aa8f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 19:27:59 +0000 Subject: [PATCH 2/4] Bump actions/upload-pages-artifact from 3 to 4 Bumps [actions/upload-pages-artifact](https://github.com/actions/upload-pages-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-pages-artifact/releases) - [Commits](https://github.com/actions/upload-pages-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-pages-artifact dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 864ecb9..fb5e246 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -56,7 +56,7 @@ jobs: scripts/build-website.sh - name: Upload artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v4 with: path: examples/website/dist -- 2.47.2 From 27f071d8db15ecfab202232165884e1e75f514d4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 19:21:49 +0000 Subject: [PATCH 3/4] Bump actions/setup-node from 4.4.0 to 6.0.0 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.4.0 to 6.0.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v4.4.0...v6.0.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 703de43..fd9711d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup Node.js environment - uses: actions/setup-node@v4.4.0 + uses: actions/setup-node@v6.0.0 with: node-version: '22.x' check-latest: true @@ -88,7 +88,7 @@ jobs: - uses: actions/checkout@v4 - name: Setup Node.js environment - uses: actions/setup-node@v4.4.0 + uses: actions/setup-node@v6.0.0 with: node-version: '22.x' check-latest: true -- 2.47.2 From 3d49eb88590c0ecfee40324014b4b37d538dec09 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 26 Oct 2025 22:05:52 +0000 Subject: [PATCH 4/4] Add link --- examples/website/src/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/website/src/index.html b/examples/website/src/index.html index b64c864..0d5d71f 100644 --- a/examples/website/src/index.html +++ b/examples/website/src/index.html @@ -23,6 +23,7 @@ reconcile-text: conflict-free 3-way text merging +
-- 2.47.2