diff --git a/Cargo.lock b/Cargo.lock index 143a8d0..29ab0a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -244,6 +244,31 @@ dependencies = [ "syn", ] +[[package]] +name = "dagger-bootstrap" +version = "0.2.10" +dependencies = [ + "clap", + "color-eyre", + "dagger-codegen", + "dagger-core", + "dirs", + "eyre", + "flate2", + "graphql-introspection-query", + "graphql_client", + "hex", + "hex-literal", + "platform-info", + "reqwest", + "serde", + "serde_json", + "sha2", + "tar", + "tempfile", + "tokio", +] + [[package]] name = "dagger-codegen" version = "0.2.8" @@ -281,31 +306,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "dagger-rs" -version = "0.2.10" -dependencies = [ - "clap", - "color-eyre", - "dagger-codegen", - "dagger-core", - "dirs", - "eyre", - "flate2", - "graphql-introspection-query", - "graphql_client", - "hex", - "hex-literal", - "platform-info", - "reqwest", - "serde", - "serde_json", - "sha2", - "tar", - "tempfile", - "tokio", -] - [[package]] name = "dagger-sdk" version = "0.2.19" diff --git a/Cargo.toml b/Cargo.toml index 52a816d..b52a87b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,14 +3,14 @@ members = [ "crates/dagger-codegen", "crates/dagger-sdk", "crates/dagger-core", - "crates/dagger-rs", + "crates/dagger-bootstrap", "ci", ] [workspace.dependencies] dagger-codegen = { path = "crates/dagger-codegen", version = "^0.2.5" } dagger-core = { path = "crates/dagger-core", version = "^0.2.8" } -dagger-rs = { path = "crates/dagger-rs", version = "^0.2.10" } +dagger-bootstrap = { path = "crates/dagger-bootstrap", version = "^0.2.10" } dagger-sdk = { path = "crates/dagger-sdk", version = "^0.2.19" } eyre = "0.6.8" diff --git a/Makefile.toml b/Makefile.toml index 43dc40e..0a92d6f 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -8,7 +8,7 @@ command = "cargo" args = [ "run", "-p", - "dagger-rs", + "dagger-bootstrap", "--", "generate", "--output", diff --git a/ci/src/main.rs b/ci/src/main.rs index 612fbba..1cec3c9 100644 --- a/ci/src/main.rs +++ b/ci/src/main.rs @@ -90,7 +90,7 @@ async fn release(client: Arc, _subm: &clap::ArgMatches) -> Result<(), col "--execute", "--allow-fully-generated-changelogs", "--no-changelog-preview", - "dagger-rs", + "dagger-sdk", "dagger-sdk", ]); let exit = container.exit_code().await?; diff --git a/crates/dagger-rs/Cargo.toml b/crates/dagger-bootstrap/Cargo.toml similarity index 91% rename from crates/dagger-rs/Cargo.toml rename to crates/dagger-bootstrap/Cargo.toml index 788802c..49a0297 100644 --- a/crates/dagger-rs/Cargo.toml +++ b/crates/dagger-bootstrap/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "dagger-rs" +name = "dagger-bootstrap" version = "0.2.10" edition = "2021" readme = "README.md" license-file = "LICENSE.MIT" description = "A dagger sdk for rust, written in rust" -repository = "https://github.com/kjuulh/dagger-rs" +repository = "https://github.com/kjuulh/dagger-sdk" publish = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/dagger-rs/src/cli.rs b/crates/dagger-bootstrap/src/cli.rs similarity index 100% rename from crates/dagger-rs/src/cli.rs rename to crates/dagger-bootstrap/src/cli.rs diff --git a/crates/dagger-rs/src/cli_generate.rs b/crates/dagger-bootstrap/src/cli_generate.rs similarity index 100% rename from crates/dagger-rs/src/cli_generate.rs rename to crates/dagger-bootstrap/src/cli_generate.rs diff --git a/crates/dagger-rs/src/main.rs b/crates/dagger-bootstrap/src/main.rs similarity index 100% rename from crates/dagger-rs/src/main.rs rename to crates/dagger-bootstrap/src/main.rs diff --git a/crates/dagger-codegen/Cargo.toml b/crates/dagger-codegen/Cargo.toml index a6ae7d0..0a51380 100644 --- a/crates/dagger-codegen/Cargo.toml +++ b/crates/dagger-codegen/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" readme = "README.md" license-file = "LICENSE.MIT" description = "dagger sdk codegen library" -repository = "https://github.com/kjuulh/dagger-rs" +repository = "https://github.com/kjuulh/dagger-sdk" publish = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/dagger-core/Cargo.toml b/crates/dagger-core/Cargo.toml index a6f4e07..dd22c7f 100644 --- a/crates/dagger-core/Cargo.toml +++ b/crates/dagger-core/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" readme = "README.md" license-file = "LICENSE.MIT" description = "dagger sdk core library" -repository = "https://github.com/kjuulh/dagger-rs" +repository = "https://github.com/kjuulh/dagger-sdk" publish = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/dagger-sdk/Cargo.toml b/crates/dagger-sdk/Cargo.toml index c616eb6..2954751 100644 --- a/crates/dagger-sdk/Cargo.toml +++ b/crates/dagger-sdk/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" readme = "README.md" license-file = "LICENSE.MIT" description = "A dagger sdk for rust, written in rust" -repository = "https://github.com/kjuulh/dagger-rs" +repository = "https://github.com/kjuulh/dagger-sdk" publish = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/crates/dagger-sdk/examples/caching/main.rs b/crates/dagger-sdk/examples/caching/main.rs index 862ecbe..ec1646b 100644 --- a/crates/dagger-sdk/examples/caching/main.rs +++ b/crates/dagger-sdk/examples/caching/main.rs @@ -35,7 +35,7 @@ async fn main() -> eyre::Result<()> { .container() .from("nginx") .with_directory("/usr/share/nginx/html", build_dir.id().await?) - .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::())) + .publish(format!("ttl.sh/hello-dagger-sdk-{}:1h", rng.gen::())) .await?; println!("published image to: {}", ref_); diff --git a/crates/dagger-sdk/examples/existing-dockerfile/main.rs b/crates/dagger-sdk/examples/existing-dockerfile/main.rs index 05384a9..390aa6b 100644 --- a/crates/dagger-sdk/examples/existing-dockerfile/main.rs +++ b/crates/dagger-sdk/examples/existing-dockerfile/main.rs @@ -13,7 +13,7 @@ async fn main() -> eyre::Result<()> { let ref_ = client .container() .build(context_dir.id().await?) - .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::())) + .publish(format!("ttl.sh/hello-dagger-sdk-{}:1h", rng.gen::())) .await?; println!("published image to: {}", ref_); diff --git a/crates/dagger-sdk/examples/multi-stage-build/main.rs b/crates/dagger-sdk/examples/multi-stage-build/main.rs index 1bc0e06..60c70b6 100644 --- a/crates/dagger-sdk/examples/multi-stage-build/main.rs +++ b/crates/dagger-sdk/examples/multi-stage-build/main.rs @@ -34,7 +34,7 @@ async fn main() -> eyre::Result<()> { .container() .from("nginx") .with_directory("/usr/share/nginx/html", build_dir.id().await?) - .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::())) + .publish(format!("ttl.sh/hello-dagger-sdk-{}:1h", rng.gen::())) .await?; println!("published image to: {}", ref_); diff --git a/crates/dagger-sdk/examples/publish-the-application/main.rs b/crates/dagger-sdk/examples/publish-the-application/main.rs index 4d96d24..dc6823b 100644 --- a/crates/dagger-sdk/examples/publish-the-application/main.rs +++ b/crates/dagger-sdk/examples/publish-the-application/main.rs @@ -39,7 +39,7 @@ async fn main() -> eyre::Result<()> { "/usr/share/nginx/html", client.host().directory(output).id().await?, ) - .publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::())) + .publish(format!("ttl.sh/hello-dagger-sdk-{}:1h", rng.gen::())) .await?; println!("published image to: {}", ref_);