From 8c5ab99fa7bd80bf0b0d5b72d1e83f017792edca Mon Sep 17 00:00:00 2001 From: Joseph Cruz Date: Mon, 24 Jul 2023 11:35:34 -0400 Subject: [PATCH] build(examples): pull up compile tasks (#1417) * build(examples): pull up compile tasks * build(examples): set toolchain for compiles tasks * build(examples): set toolchain for build and check * build(examples): set toolchain of other examples --- Makefile.toml | 12 ++++++++++++ examples/cargo-make/compile.toml | 11 +++++++++++ examples/cargo-make/main.toml | 15 ++++++++++++--- examples/counter/Makefile.toml | 10 ---------- examples/counter_isomorphic/Makefile.toml | 10 ---------- examples/counter_without_macros/Makefile.toml | 6 ++++-- examples/counters/Makefile.toml | 10 ---------- examples/counters_stable/Makefile.toml | 9 ++++++++- examples/error_boundary/Makefile.toml | 10 ---------- examples/errors_axum/Makefile.toml | 10 ---------- examples/fetch/Makefile.toml | 10 ---------- examples/hackernews/Makefile.toml | 10 ---------- examples/hackernews_axum/Makefile.toml | 10 ---------- examples/js-framework-benchmark/Makefile.toml | 6 ++++-- examples/leptos-tailwind-axum/Makefile.toml | 10 ---------- examples/login_with_token_csr_only/Makefile.toml | 10 ---------- examples/parent_child/Makefile.toml | 10 ---------- examples/router/Makefile.toml | 10 ---------- examples/session_auth_axum/Makefile.toml | 10 ---------- examples/slots/Makefile.toml | 10 ---------- examples/ssr_modes/Makefile.toml | 10 ---------- examples/ssr_modes_axum/Makefile.toml | 10 ---------- examples/tailwind/Makefile.toml | 10 ---------- examples/tailwind_csr_trunk/Makefile.toml | 10 ---------- examples/timer/Makefile.toml | 10 ---------- examples/todo_app_sqlite/Makefile.toml | 11 ++++------- examples/todo_app_sqlite_axum/Makefile.toml | 10 ---------- examples/todo_app_sqlite_viz/Makefile.toml | 10 ---------- examples/todomvc/Makefile.toml | 10 ---------- 29 files changed, 55 insertions(+), 235 deletions(-) create mode 100644 examples/cargo-make/compile.toml diff --git a/Makefile.toml b/Makefile.toml index d933f470d..b9e3d9a6e 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -20,6 +20,18 @@ cwd = "examples" command = "cargo" args = ["make", "ci-clean"] +[tasks.check-examples] +workspace = false +cwd = "examples" +command = "cargo" +args = ["make", "check-clean"] + +[tasks.build-examples] +workspace = false +cwd = "examples" +command = "cargo" +args = ["make", "build-clean"] + [tasks.clean-examples] workspace = false cwd = "examples" diff --git a/examples/cargo-make/compile.toml b/examples/cargo-make/compile.toml new file mode 100644 index 000000000..f464271c3 --- /dev/null +++ b/examples/cargo-make/compile.toml @@ -0,0 +1,11 @@ +[tasks.build] +toolchain = "nightly" +command = "cargo" +args = ["build-all-features"] +install_crate = "cargo-all-features" + +[tasks.check] +toolchain = "nightly" +command = "cargo" +args = ["check-all-features"] +install_crate = "cargo-all-features" diff --git a/examples/cargo-make/main.toml b/examples/cargo-make/main.toml index 3456383d4..a4101b978 100644 --- a/examples/cargo-make/main.toml +++ b/examples/cargo-make/main.toml @@ -1,4 +1,5 @@ extend = [ + { path = "../cargo-make/compile.toml" }, { path = "../cargo-make/clean.toml" }, { path = "../cargo-make/lint.toml" }, { path = "../cargo-make/node.toml" }, @@ -9,9 +10,6 @@ extend = [ [tasks.ci] dependencies = ["prepare", "lint", "build", "test-flow", "integration-test"] -[tasks.ci-clean] -dependencies = ["ci", "clean"] - [tasks.prepare] dependencies = ["setup-node"] @@ -20,6 +18,17 @@ dependencies = ["check-style"] [tasks.integration-test] +# Support Local Runs + +[tasks.ci-clean] +dependencies = ["ci", "clean"] + +[tasks.check-clean] +dependencies = ["check", "clean"] + +[tasks.build-clean] +dependencies = ["build", "clean"] + # ALIASES [tasks.verify-flow] diff --git a/examples/counter/Makefile.toml b/examples/counter/Makefile.toml index 884b19bcb..1522751b7 100644 --- a/examples/counter/Makefile.toml +++ b/examples/counter/Makefile.toml @@ -2,13 +2,3 @@ extend = [ { path = "../cargo-make/main.toml" }, { path = "../cargo-make/wasm-test.toml" }, ] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/counter_isomorphic/Makefile.toml b/examples/counter_isomorphic/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/counter_isomorphic/Makefile.toml +++ b/examples/counter_isomorphic/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/counter_without_macros/Makefile.toml b/examples/counter_without_macros/Makefile.toml index bc3b6b03c..53b747cbb 100644 --- a/examples/counter_without_macros/Makefile.toml +++ b/examples/counter_without_macros/Makefile.toml @@ -4,11 +4,13 @@ extend = [ ] [tasks.build] +toolchain = "stable" command = "cargo" -args = ["+stable", "build-all-features"] +args = ["build-all-features"] install_crate = "cargo-all-features" [tasks.check] +toolchain = "stable" command = "cargo" -args = ["+stable", "check-all-features"] +args = ["check-all-features"] install_crate = "cargo-all-features" diff --git a/examples/counters/Makefile.toml b/examples/counters/Makefile.toml index 884b19bcb..1522751b7 100644 --- a/examples/counters/Makefile.toml +++ b/examples/counters/Makefile.toml @@ -2,13 +2,3 @@ extend = [ { path = "../cargo-make/main.toml" }, { path = "../cargo-make/wasm-test.toml" }, ] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/counters_stable/Makefile.toml b/examples/counters_stable/Makefile.toml index 447a24c0d..b55782e1d 100644 --- a/examples/counters_stable/Makefile.toml +++ b/examples/counters_stable/Makefile.toml @@ -6,6 +6,13 @@ extend = [ ] [tasks.build] +toolchain = "stable" command = "cargo" -args = ["+stable", "build-all-features"] +args = ["build-all-features"] +install_crate = "cargo-all-features" + +[tasks.check] +toolchain = "stable" +command = "cargo" +args = ["check-all-features"] install_crate = "cargo-all-features" diff --git a/examples/error_boundary/Makefile.toml b/examples/error_boundary/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/error_boundary/Makefile.toml +++ b/examples/error_boundary/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/errors_axum/Makefile.toml b/examples/errors_axum/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/errors_axum/Makefile.toml +++ b/examples/errors_axum/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/fetch/Makefile.toml b/examples/fetch/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/fetch/Makefile.toml +++ b/examples/fetch/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/hackernews/Makefile.toml b/examples/hackernews/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/hackernews/Makefile.toml +++ b/examples/hackernews/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/hackernews_axum/Makefile.toml b/examples/hackernews_axum/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/hackernews_axum/Makefile.toml +++ b/examples/hackernews_axum/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/js-framework-benchmark/Makefile.toml b/examples/js-framework-benchmark/Makefile.toml index add6c2bd7..447e737e0 100644 --- a/examples/js-framework-benchmark/Makefile.toml +++ b/examples/js-framework-benchmark/Makefile.toml @@ -4,13 +4,15 @@ extend = [ ] [tasks.build] +toolchain = "nightly" command = "cargo" -args = ["+nightly", "build-all-features", "--target", "wasm32-unknown-unknown"] +args = ["build-all-features", "--target", "wasm32-unknown-unknown"] install_crate = "cargo-all-features" [tasks.check] +toolchain = "nightly" command = "cargo" -args = ["+nightly", "check-all-features", "--target", "wasm32-unknown-unknown"] +args = ["check-all-features", "--target", "wasm32-unknown-unknown"] install_crate = "cargo-all-features" [tasks.pre-clippy] diff --git a/examples/leptos-tailwind-axum/Makefile.toml b/examples/leptos-tailwind-axum/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/leptos-tailwind-axum/Makefile.toml +++ b/examples/leptos-tailwind-axum/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/login_with_token_csr_only/Makefile.toml b/examples/login_with_token_csr_only/Makefile.toml index 15fb0d631..3d822c68d 100644 --- a/examples/login_with_token_csr_only/Makefile.toml +++ b/examples/login_with_token_csr_only/Makefile.toml @@ -1,11 +1 @@ extend = { path = "../cargo-make/main.toml" } - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/parent_child/Makefile.toml b/examples/parent_child/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/parent_child/Makefile.toml +++ b/examples/parent_child/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/router/Makefile.toml b/examples/router/Makefile.toml index 0a25519d5..bca772b69 100644 --- a/examples/router/Makefile.toml +++ b/examples/router/Makefile.toml @@ -3,13 +3,3 @@ extend = [ { path = "../cargo-make/trunk_server.toml" }, { path = "../cargo-make/playwright-test.toml" }, ] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/session_auth_axum/Makefile.toml b/examples/session_auth_axum/Makefile.toml index 15fb0d631..3d822c68d 100644 --- a/examples/session_auth_axum/Makefile.toml +++ b/examples/session_auth_axum/Makefile.toml @@ -1,11 +1 @@ extend = { path = "../cargo-make/main.toml" } - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/slots/Makefile.toml b/examples/slots/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/slots/Makefile.toml +++ b/examples/slots/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/ssr_modes/Makefile.toml b/examples/ssr_modes/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/ssr_modes/Makefile.toml +++ b/examples/ssr_modes/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/ssr_modes_axum/Makefile.toml b/examples/ssr_modes_axum/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/ssr_modes_axum/Makefile.toml +++ b/examples/ssr_modes_axum/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/tailwind/Makefile.toml b/examples/tailwind/Makefile.toml index 6db726c3f..23e176d74 100644 --- a/examples/tailwind/Makefile.toml +++ b/examples/tailwind/Makefile.toml @@ -2,13 +2,3 @@ extend = [ { path = "../cargo-make/main.toml" }, { path = "../cargo-make/cargo-leptos-test.toml" }, ] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/tailwind_csr_trunk/Makefile.toml b/examples/tailwind_csr_trunk/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/tailwind_csr_trunk/Makefile.toml +++ b/examples/tailwind_csr_trunk/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/timer/Makefile.toml b/examples/timer/Makefile.toml index fe3563917..6fe53288a 100644 --- a/examples/timer/Makefile.toml +++ b/examples/timer/Makefile.toml @@ -1,11 +1 @@ extend = [{ path = "../cargo-make/main.toml" }] - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/todo_app_sqlite/Makefile.toml b/examples/todo_app_sqlite/Makefile.toml index bd817570d..08e649ede 100644 --- a/examples/todo_app_sqlite/Makefile.toml +++ b/examples/todo_app_sqlite/Makefile.toml @@ -1,20 +1,17 @@ extend = { path = "../cargo-make/main.toml" } -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - [tasks.check] clear = true dependencies = ["check-debug", "check-release"] [tasks.check-debug] +toolchain = "nightly" command = "cargo" -args = ["+nightly", "check-all-features"] +args = ["check-all-features"] install_crate = "cargo-all-features" [tasks.check-release] +toolchain = "nightly" command = "cargo" -args = ["+nightly", "check-all-features", "--release"] +args = ["check-all-features", "--release"] install_crate = "cargo-all-features" diff --git a/examples/todo_app_sqlite_axum/Makefile.toml b/examples/todo_app_sqlite_axum/Makefile.toml index 15fb0d631..3d822c68d 100644 --- a/examples/todo_app_sqlite_axum/Makefile.toml +++ b/examples/todo_app_sqlite_axum/Makefile.toml @@ -1,11 +1 @@ extend = { path = "../cargo-make/main.toml" } - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/todo_app_sqlite_viz/Makefile.toml b/examples/todo_app_sqlite_viz/Makefile.toml index 15fb0d631..3d822c68d 100644 --- a/examples/todo_app_sqlite_viz/Makefile.toml +++ b/examples/todo_app_sqlite_viz/Makefile.toml @@ -1,11 +1 @@ extend = { path = "../cargo-make/main.toml" } - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features" diff --git a/examples/todomvc/Makefile.toml b/examples/todomvc/Makefile.toml index 237d03985..2235daad6 100644 --- a/examples/todomvc/Makefile.toml +++ b/examples/todomvc/Makefile.toml @@ -3,13 +3,3 @@ extend = { path = "../cargo-make/main.toml" } [tasks.setup-node] env = { SETUP_NODE = false } condition = { env_true = ["SETUP_NODE"] } - -[tasks.build] -command = "cargo" -args = ["+nightly", "build-all-features"] -install_crate = "cargo-all-features" - -[tasks.check] -command = "cargo" -args = ["+nightly", "check-all-features"] -install_crate = "cargo-all-features"