Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/warp support #326

Merged
merged 16 commits into from
Oct 11, 2022
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ e2e/users.toml

.shuttle-*
docker-compose.rendered.yml

# Env variables
.cargo/
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