Skip to content

Commit

Permalink
Feat/warp support (#326)
Browse files Browse the repository at this point in the history
* feat: adding warp web framework

* building version

* warp additions

* warp working without init code

* warp init functionality

* env variable and cargo removal

* cleanup

* test and feature fix

* adding tests

* fix: nits

* fix: shuttle-service version

* fix: duplicated code in init, cargo.lock

Co-authored-by: oddgrd <[email protected]>
  • Loading branch information
jmwill86 and oddgrd authored Oct 11, 2022
1 parent 0f656a0 commit 839e6e6
Show file tree
Hide file tree
Showing 14 changed files with 302 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ workflows:
- workspace-fmt
matrix:
parameters:
framework: ["web-axum", "web-rocket", "web-poem", "web-tide", "web-tower", "web-salvo", "bot-serenity"]
framework: ["web-axum", "web-rocket", "web-poem", "web-tide", "web-tower","web-warp", "web-salvo", "bot-serenity"]
- check-standalone:
matrix:
parameters:
Expand Down
135 changes: 124 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions api/users.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
[test-key]
name = 'ci'
projects = [
'hello-world-rocket-app',
'postgres-rocket-app',
'hello-world-axum-app',
'websocket-axum-app',
'hello-world-salvo-app',
'authentication-rocket-app',
'hello-world-axum-app',
'hello-world-poem-app',
'hello-world-rocket-app',
'hello-world-tide-app',
'hello-world-tower-app',
'hello-world-warp-app',
'postgres-poem-app',
'postgres-rocket-app',
'postgres-tide-app',
'hello-world-poem-app',
'postgres-poem-app'
]
17 changes: 10 additions & 7 deletions cargo-shuttle/src/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,26 +98,29 @@ pub struct RunArgs {
#[derive(Parser, Debug)]
pub struct InitArgs {
/// Initialize with axum framework
#[clap(long, conflicts_with_all = &["rocket", "tide", "tower", "poem", "serenity", "salvo"])]
#[clap(long, conflicts_with_all = &["rocket", "tide", "tower", "poem", "serenity", "warp", "salvo"])]
pub axum: bool,
/// Initialize with actix-web framework
#[clap(long, conflicts_with_all = &["axum", "tide", "tower", "poem", "serenity", "salvo"])]
#[clap(long, conflicts_with_all = &["axum", "tide", "tower", "poem", "serenity", "warp", "salvo"])]
pub rocket: bool,
/// Initialize with tide framework
#[clap(long, conflicts_with_all = &["axum", "rocket", "tower", "poem", "serenity", "salvo"])]
#[clap(long, conflicts_with_all = &["axum", "rocket", "tower", "poem", "serenity", "warp", "salvo"])]
pub tide: bool,
/// Initialize with tower framework
#[clap(long, conflicts_with_all = &["axum", "rocket", "tide", "poem", "serenity", "salvo"])]
#[clap(long, conflicts_with_all = &["axum", "rocket", "tide", "poem", "serenity", "warp", "salvo"])]
pub tower: bool,
/// Initialize with poem framework
#[clap(long, conflicts_with_all = &["axum", "rocket", "tide", "tower", "serenity", "salvo"])]
#[clap(long, conflicts_with_all = &["axum", "rocket", "tide", "tower", "serenity", "warp", "salvo"])]
pub poem: bool,
/// Initialize with salvo framework
#[clap(long, conflicts_with_all = &["axum", "rocket", "tide", "tower", "poem", "serenity"])]
#[clap(long, conflicts_with_all = &["axum", "rocket", "tide", "tower", "poem", "warp", "serenity"])]
pub salvo: bool,
/// Initialize with serenity framework
#[clap(long, conflicts_with_all = &["axum", "rocket", "tide", "tower", "poem", "salvo"])]
#[clap(long, conflicts_with_all = &["axum", "rocket", "tide", "tower", "poem", "warp", "salvo"])]
pub serenity: bool,
/// Initialize with warp framework
#[clap(long, conflicts_with_all = &["axum", "rocket", "tide", "tower", "poem", "serenity", "salvo"])]
pub warp: bool,
/// Path to initialize a new shuttle project
#[clap(
parse(try_from_os_str = parse_init_path),
Expand Down
Loading

0 comments on commit 839e6e6

Please sign in to comment.