From ce4711e99634caddc2caa5e42c028a9d6b03968b Mon Sep 17 00:00:00 2001 From: Joseph Cruz Date: Mon, 18 Mar 2024 16:23:32 -0400 Subject: [PATCH 1/7] chore(ci): install jq with apt --- .github/workflows/get-examples-matrix.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/get-examples-matrix.yml b/.github/workflows/get-examples-matrix.yml index aff211cd41..7fb309adce 100644 --- a/.github/workflows/get-examples-matrix.yml +++ b/.github/workflows/get-examples-matrix.yml @@ -17,8 +17,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Install JQ Tool - uses: mbround18/install-jq@v1 + - name: Install jq + run: sudo apt-get install jq - name: Set Matrix id: set-matrix From e75e991a196c6882982136b10d1d1b947887f56f Mon Sep 17 00:00:00 2001 From: Joseph Cruz Date: Mon, 18 Mar 2024 16:25:56 -0400 Subject: [PATCH 2/7] chore(ci): install trunk with cargo --- .github/workflows/run-cargo-make-task.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/run-cargo-make-task.yml b/.github/workflows/run-cargo-make-task.yml index 2b8e68fc6a..27f0b1e63d 100644 --- a/.github/workflows/run-cargo-make-task.yml +++ b/.github/workflows/run-cargo-make-task.yml @@ -54,9 +54,7 @@ jobs: run: cargo binstall cargo-leptos --no-confirm - name: Install Trunk - uses: jetli/trunk-action@v0.4.0 - with: - version: "latest" + run: cargo binstall trunk --no-confirm - name: Print Trunk Version run: trunk --version From e7d4b3162a47bc0913ee3006835bdae7939931d8 Mon Sep 17 00:00:00 2001 From: Joseph Cruz Date: Mon, 18 Mar 2024 16:32:23 -0400 Subject: [PATCH 3/7] chore(ci): replace toolchain action --- .github/workflows/run-cargo-make-task.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/run-cargo-make-task.yml b/.github/workflows/run-cargo-make-task.yml index 27f0b1e63d..9c557dff57 100644 --- a/.github/workflows/run-cargo-make-task.yml +++ b/.github/workflows/run-cargo-make-task.yml @@ -27,11 +27,9 @@ jobs: - uses: actions/checkout@v4 - name: Setup Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@master with: toolchain: ${{ inputs.toolchain }} - override: true - components: rustfmt - name: Add wasm32-unknown-unknown run: rustup target add wasm32-unknown-unknown From 4dc9d933feae6d80ba92637add0f07d938975d96 Mon Sep 17 00:00:00 2001 From: Joseph Cruz Date: Mon, 18 Mar 2024 16:33:37 -0400 Subject: [PATCH 4/7] chore(ci): upgrade pnpm cache action --- .github/workflows/run-cargo-make-task.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-cargo-make-task.yml b/.github/workflows/run-cargo-make-task.yml index 9c557dff57..431dd27bf8 100644 --- a/.github/workflows/run-cargo-make-task.yml +++ b/.github/workflows/run-cargo-make-task.yml @@ -62,7 +62,7 @@ jobs: with: node-version: 20 - - uses: pnpm/action-setup@v3 + - uses: pnpm/action-setup@v4 name: Install pnpm id: pnpm-install with: From 44a39ea7906b356d89da4ab913bb0dcaebf34bb1 Mon Sep 17 00:00:00 2001 From: Joseph Cruz Date: Mon, 18 Mar 2024 16:34:26 -0400 Subject: [PATCH 5/7] chore: simulate change --- leptos/tests/ssr.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/leptos/tests/ssr.rs b/leptos/tests/ssr.rs index 32a116a9b7..c6729f0bbc 100644 --- a/leptos/tests/ssr.rs +++ b/leptos/tests/ssr.rs @@ -206,3 +206,5 @@ fn ssr_option() { runtime.dispose(); } + +// TODO: simulate change to trigger ci examples From d62e3f8ee4a13d5d08c3eb4cff59c756f93f4686 Mon Sep 17 00:00:00 2001 From: Joseph Cruz Date: Mon, 18 Mar 2024 16:50:14 -0400 Subject: [PATCH 6/7] fix(ci): pnpm cache action typo --- .github/workflows/run-cargo-make-task.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-cargo-make-task.yml b/.github/workflows/run-cargo-make-task.yml index 431dd27bf8..90a8d9915a 100644 --- a/.github/workflows/run-cargo-make-task.yml +++ b/.github/workflows/run-cargo-make-task.yml @@ -62,7 +62,7 @@ jobs: with: node-version: 20 - - uses: pnpm/action-setup@v4 + - uses: pnpm/action-setup@v3 name: Install pnpm id: pnpm-install with: @@ -74,7 +74,7 @@ jobs: run: | echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 + - uses: actions/cache@v4 name: Setup pnpm cache with: path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} From 2ad616151ba5a26b89e7856012b756484b5a5e9d Mon Sep 17 00:00:00 2001 From: Joseph Cruz Date: Mon, 18 Mar 2024 17:34:40 -0400 Subject: [PATCH 7/7] chore: remove simulated change --- leptos/tests/ssr.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/leptos/tests/ssr.rs b/leptos/tests/ssr.rs index c6729f0bbc..32a116a9b7 100644 --- a/leptos/tests/ssr.rs +++ b/leptos/tests/ssr.rs @@ -206,5 +206,3 @@ fn ssr_option() { runtime.dispose(); } - -// TODO: simulate change to trigger ci examples