Refer to workspace meta, Fix CI? #3

shuttle-hq · Jun 19, 2023 · a1dddda · a1dddda
1 parent 8cb6d34
commit a1dddda
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"]