Merge remote-tracking branch 'upstream/main' into ci-semver

leptos-rs · Mar 22, 2024 · 7d115e0 · 7d115e0
2 parents 1fdb44e + 5819014
commit 7d115e0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/get-example-changed.yml b/.github/workflows/get-example-changed.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Get example files that changed
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v43
         with:
           files: |
             examples/**

diff --git a/.github/workflows/get-leptos-changed.yml b/.github/workflows/get-leptos-changed.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Get source files that changed
         id: changed-source
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v43
         with:
           files: |
             integrations/**

diff --git a/.github/workflows/run-cargo-make-task.yml b/.github/workflows/run-cargo-make-task.yml
@@ -52,7 +52,9 @@ jobs:
         run: cargo binstall cargo-leptos --no-confirm
 
       - name: Install Trunk
-        run: cargo binstall trunk --no-confirm
+        uses: jetli/[email protected]
+        with:
+          version: "latest"
 
       - name: Print Trunk Version
         run: trunk --version

diff --git a/examples/server_fns_axum/migrations/20221118172000_create_todo_table.sql b/examples/server_fns_axum/migrations/20221118172000_create_todo_table.sql
diff --git a/server_fn/src/lib.rs b/server_fn/src/lib.rs
@@ -28,7 +28,7 @@
 //!
 //! ### `#[server]`
 //!
-//! The [`#[server]`][server] macro allows you to annotate a function to
+//! The [`#[server]`](../leptos/attr.server.html) macro allows you to annotate a function to
 //! indicate that it should only run on the server (i.e., when you have an `ssr` feature in your
 //! crate that is enabled).
 //!