From a1dddda088d3443719a9dba880c0712b8a9abc58 Mon Sep 17 00:00:00 2001 From: jonaro00 <54029719+jonaro00@users.noreply.github.com> Date: Mon, 19 Jun 2023 23:54:54 +0200 Subject: [PATCH] Refer to workspace meta, Fix CI? #3 --- .circleci/config.yml | 10 +++++----- resources/persist/Cargo.toml | 5 +++-- resources/secrets/Cargo.toml | 5 +++-- resources/static-folder/Cargo.toml | 5 +++-- services/shuttle-actix-web/Cargo.toml | 5 +++-- services/shuttle-axum/Cargo.toml | 5 +++-- services/shuttle-next/Cargo.toml | 5 +++-- services/shuttle-poem/Cargo.toml | 5 +++-- services/shuttle-poise/Cargo.toml | 5 +++-- services/shuttle-rocket/Cargo.toml | 5 +++-- services/shuttle-salvo/Cargo.toml | 5 +++-- services/shuttle-serenity/Cargo.toml | 5 +++-- services/shuttle-thruster/Cargo.toml | 5 +++-- services/shuttle-tide/Cargo.toml | 5 +++-- services/shuttle-tower/Cargo.toml | 5 +++-- services/shuttle-warp/Cargo.toml | 5 +++-- 16 files changed, 50 insertions(+), 35 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f29a197bd6..b51957e05f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,11 +88,11 @@ commands: command: | cat\<< EOF > ~/.cargo/config.toml [patch.crates-io] - shuttle-codegen = { path = "$PWD/shuttle/codegen" } - shuttle-common = { path = "$PWD/shuttle/common" } - shuttle-proto = { path = "$PWD/shuttle/proto" } - shuttle-runtime = { path = "$PWD/shuttle/runtime" } - shuttle-service = { path = "$PWD/shuttle/service" } + shuttle-codegen = { path = "$PWD/codegen" } + shuttle-common = { path = "$PWD/common" } + shuttle-proto = { path = "$PWD/proto" } + shuttle-runtime = { path = "$PWD/runtime" } + shuttle-service = { path = "$PWD/service" } shuttle-aws-rds = { path = "$PWD/resources/aws-rds" } shuttle-persist = { path = "$PWD/resources/persist" } diff --git a/resources/persist/Cargo.toml b/resources/persist/Cargo.toml index 2bf09c19fa..1860039378 100644 --- a/resources/persist/Cargo.toml +++ b/resources/persist/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-persist" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Plugin for persist objects" keywords = ["shuttle-service", "persistence"] diff --git a/resources/secrets/Cargo.toml b/resources/secrets/Cargo.toml index 94820c2599..6493d06838 100644 --- a/resources/secrets/Cargo.toml +++ b/resources/secrets/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-secrets" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Plugin to for managing secrets on shuttle" keywords = ["shuttle-service", "secrets"] diff --git a/resources/static-folder/Cargo.toml b/resources/static-folder/Cargo.toml index 30feccc63d..d39594592f 100644 --- a/resources/static-folder/Cargo.toml +++ b/resources/static-folder/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-static-folder" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Plugin to get a static folder at runtime on shuttle" keywords = ["shuttle-service", "static-folder"] diff --git a/services/shuttle-actix-web/Cargo.toml b/services/shuttle-actix-web/Cargo.toml index 664f814233..ea83e97c08 100644 --- a/services/shuttle-actix-web/Cargo.toml +++ b/services/shuttle-actix-web/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-actix-web" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run an actix webserver on shuttle" keywords = ["shuttle-service", "actix"] diff --git a/services/shuttle-axum/Cargo.toml b/services/shuttle-axum/Cargo.toml index 9e40f8f1a9..f84adff792 100644 --- a/services/shuttle-axum/Cargo.toml +++ b/services/shuttle-axum/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-axum" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run an axum webserver on shuttle" keywords = ["shuttle-service", "axum"] diff --git a/services/shuttle-next/Cargo.toml b/services/shuttle-next/Cargo.toml index 73be82e7f8..2f9a1afbba 100644 --- a/services/shuttle-next/Cargo.toml +++ b/services/shuttle-next/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-next" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Macros and aliases to deploy wasm on the shuttle platform (https://www.shuttle.rs/)" homepage = "https://www.shuttle.rs" diff --git a/services/shuttle-poem/Cargo.toml b/services/shuttle-poem/Cargo.toml index 12790d6b9d..a3a06e1d76 100644 --- a/services/shuttle-poem/Cargo.toml +++ b/services/shuttle-poem/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-poem" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a poem webserver on shuttle" keywords = ["shuttle-service", "poem"] diff --git a/services/shuttle-poise/Cargo.toml b/services/shuttle-poise/Cargo.toml index 29473d41cb..4fe74b32bd 100644 --- a/services/shuttle-poise/Cargo.toml +++ b/services/shuttle-poise/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-poise" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a poise discord bot on shuttle" keywords = ["shuttle-service", "poise", "discord-bot", "serenity"] diff --git a/services/shuttle-rocket/Cargo.toml b/services/shuttle-rocket/Cargo.toml index 1a79a57a40..7da5cd26ef 100644 --- a/services/shuttle-rocket/Cargo.toml +++ b/services/shuttle-rocket/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-rocket" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a rocket webserver on shuttle" keywords = ["shuttle-service", "rocket"] diff --git a/services/shuttle-salvo/Cargo.toml b/services/shuttle-salvo/Cargo.toml index c998a885c3..ccb2726d00 100644 --- a/services/shuttle-salvo/Cargo.toml +++ b/services/shuttle-salvo/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-salvo" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a salvo webserver on shuttle" keywords = ["shuttle-service", "salvo"] diff --git a/services/shuttle-serenity/Cargo.toml b/services/shuttle-serenity/Cargo.toml index 6cbbe38a92..b1dceffb84 100644 --- a/services/shuttle-serenity/Cargo.toml +++ b/services/shuttle-serenity/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-serenity" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a serenity server on shuttle" keywords = ["shuttle-service", "serenity"] diff --git a/services/shuttle-thruster/Cargo.toml b/services/shuttle-thruster/Cargo.toml index f7d92ac0fd..c8271659e5 100644 --- a/services/shuttle-thruster/Cargo.toml +++ b/services/shuttle-thruster/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-thruster" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a thruster webserver on shuttle" keywords = ["shuttle-service", "thruster"] diff --git a/services/shuttle-tide/Cargo.toml b/services/shuttle-tide/Cargo.toml index 43231bbc3e..272a0433c5 100644 --- a/services/shuttle-tide/Cargo.toml +++ b/services/shuttle-tide/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-tide" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a tide webserver on shuttle" keywords = ["shuttle-service", "tide"] diff --git a/services/shuttle-tower/Cargo.toml b/services/shuttle-tower/Cargo.toml index f7452b0358..d0cd30e441 100644 --- a/services/shuttle-tower/Cargo.toml +++ b/services/shuttle-tower/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-tower" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a tower webserver on shuttle" keywords = ["shuttle-service", "tower"] diff --git a/services/shuttle-warp/Cargo.toml b/services/shuttle-warp/Cargo.toml index d8e9b0a53d..bf1c7f4904 100644 --- a/services/shuttle-warp/Cargo.toml +++ b/services/shuttle-warp/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "shuttle-warp" version = "0.18.0" -edition = "2021" -license = "Apache-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "Service implementation to run a warp webserver on shuttle" keywords = ["shuttle-service", "warp"]