diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b996ab56..af36bb1f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -127,7 +127,9 @@ jobs: id: tag uses: dawidd6/action-get-tag@v1 - name: Create upload directory - run: + run: | + mkdir -p target/github-release + mkdir -p target/upload - name: Package Windows files working-directory: target/github-release @@ -154,7 +156,7 @@ jobs: mkdir -p target/upload mv target/github-release/*.tar.gz* target/upload mv target/github-release/*.zip* target/upload - mv target/github-release/*.whl target/upload + mv target/github-release/**/*.whl target/upload - name: Upload binaries to GitHub Release uses: svenstaro/upload-release-action@v2 diff --git a/Cargo.lock b/Cargo.lock index bfa36db9..44213230 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -626,7 +626,7 @@ dependencies = [ [[package]] name = "cargo-lambda" -version = "0.9.0" +version = "0.10.0" dependencies = [ "build-data", "cargo-lambda-build", @@ -643,7 +643,7 @@ dependencies = [ [[package]] name = "cargo-lambda-build" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cargo-lambda-interactive", "cargo-lambda-metadata", @@ -664,7 +664,7 @@ dependencies = [ [[package]] name = "cargo-lambda-deploy" -version = "0.9.0" +version = "0.10.0" dependencies = [ "aws-sdk-s3", "cargo-lambda-build", @@ -683,7 +683,7 @@ dependencies = [ [[package]] name = "cargo-lambda-interactive" -version = "0.9.0" +version = "0.10.0" dependencies = [ "atty", "indicatif", @@ -694,7 +694,7 @@ dependencies = [ [[package]] name = "cargo-lambda-invoke" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cargo-lambda-remote", "clap", @@ -710,7 +710,7 @@ dependencies = [ [[package]] name = "cargo-lambda-metadata" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cargo_metadata 0.14.2", "libc", @@ -723,7 +723,7 @@ dependencies = [ [[package]] name = "cargo-lambda-new" -version = "0.9.0" +version = "0.10.0" dependencies = [ "cargo-lambda-interactive", "cargo-lambda-metadata", @@ -742,7 +742,7 @@ dependencies = [ [[package]] name = "cargo-lambda-remote" -version = "0.9.0" +version = "0.10.0" dependencies = [ "aws-config", "aws-sdk-lambda", @@ -752,7 +752,7 @@ dependencies = [ [[package]] name = "cargo-lambda-watch" -version = "0.9.0" +version = "0.10.0" dependencies = [ "aws_lambda_events", "axum", diff --git a/crates/cargo-lambda-build/Cargo.toml b/crates/cargo-lambda-build/Cargo.toml index 2b5290eb..79d47179 100644 --- a/crates/cargo-lambda-build/Cargo.toml +++ b/crates/cargo-lambda-build/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cargo-lambda-build" description = "Cargo subcommand to work with AWS Lambda" -version = "0.9.0" +version = "0.10.0" edition = "2021" license = "MIT" readme = "README.md" @@ -16,8 +16,8 @@ rust-version = "1.59.0" # add the latest version of a dependency to the list, # and it will keep the alphabetic ordering for you. [dependencies] -cargo-lambda-interactive = { version = "0.9.0", path = "../cargo-lambda-interactive" } -cargo-lambda-metadata = { version = "0.9.0", path = "../cargo-lambda-metadata" } +cargo-lambda-interactive = { version = "0.10.0", path = "../cargo-lambda-interactive" } +cargo-lambda-metadata = { version = "0.10.0", path = "../cargo-lambda-metadata" } cargo-zigbuild = "0.11.1" clap = { version = "3.1.18", features = ["derive"] } home = "0.5.3" diff --git a/crates/cargo-lambda-cli/Cargo.toml b/crates/cargo-lambda-cli/Cargo.toml index 26358de7..8739e02c 100644 --- a/crates/cargo-lambda-cli/Cargo.toml +++ b/crates/cargo-lambda-cli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cargo-lambda" description = "Cargo subcommand to work with AWS Lambda" -version = "0.9.0" +version = "0.10.0" edition = "2021" license = "MIT" readme = "../../README.md" @@ -16,11 +16,11 @@ rust-version = "1.59.0" # add the latest version of a dependency to the list, # and it will keep the alphabetic ordering for you. [dependencies] -cargo-lambda-build = { version = "0.9.0", path = "../cargo-lambda-build" } -cargo-lambda-deploy = { version = "0.9.0", path = "../cargo-lambda-deploy" } -cargo-lambda-invoke = { version = "0.9.0", path = "../cargo-lambda-invoke" } -cargo-lambda-new = { version = "0.9.0", path = "../cargo-lambda-new" } -cargo-lambda-watch = { version = "0.9.0", path = "../cargo-lambda-watch" } +cargo-lambda-build = { version = "0.10.0", path = "../cargo-lambda-build" } +cargo-lambda-deploy = { version = "0.10.0", path = "../cargo-lambda-deploy" } +cargo-lambda-invoke = { version = "0.10.0", path = "../cargo-lambda-invoke" } +cargo-lambda-new = { version = "0.10.0", path = "../cargo-lambda-new" } +cargo-lambda-watch = { version = "0.10.0", path = "../cargo-lambda-watch" } clap = { version = "3.1.18", features = ["derive", "suggestions"] } miette = { version = "4.7.1", features = ["fancy"] } tokio = { version = "1.18.2", features = ["macros", "rt-multi-thread"] } diff --git a/crates/cargo-lambda-deploy/Cargo.toml b/crates/cargo-lambda-deploy/Cargo.toml index 2d625852..8bedfe16 100644 --- a/crates/cargo-lambda-deploy/Cargo.toml +++ b/crates/cargo-lambda-deploy/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cargo-lambda-deploy" description = "Cargo subcommand to work with AWS Lambda" -version = "0.9.0" +version = "0.10.0" edition = "2021" license = "MIT" readme = "README.md" @@ -13,10 +13,10 @@ keywords = ["cargo", "subcommand", "aws", "lambda"] [dependencies] aws-sdk-s3 = "0.11.0" -cargo-lambda-build = { version = "0.9.0", path = "../cargo-lambda-build" } -cargo-lambda-interactive = { version = "0.9.0", path = "../cargo-lambda-interactive" } -cargo-lambda-metadata = { version = "0.9.0", path = "../cargo-lambda-metadata" } -cargo-lambda-remote = { version = "0.9.0", path = "../cargo-lambda-remote" } +cargo-lambda-build = { version = "0.10.0", path = "../cargo-lambda-build" } +cargo-lambda-interactive = { version = "0.10.0", path = "../cargo-lambda-interactive" } +cargo-lambda-metadata = { version = "0.10.0", path = "../cargo-lambda-metadata" } +cargo-lambda-remote = { version = "0.10.0", path = "../cargo-lambda-remote" } clap = { version = "3.1.18", features = ["derive"] } miette = "4.7.1" serde = { version = "1.0.137", features = ["derive"] } diff --git a/crates/cargo-lambda-interactive/Cargo.toml b/crates/cargo-lambda-interactive/Cargo.toml index 8961dbba..abdf23d0 100644 --- a/crates/cargo-lambda-interactive/Cargo.toml +++ b/crates/cargo-lambda-interactive/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cargo-lambda-interactive" description = "Cargo subcommand to work with AWS Lambda" -version = "0.9.0" +version = "0.10.0" edition = "2021" license = "MIT" readme = "README.md" diff --git a/crates/cargo-lambda-invoke/Cargo.toml b/crates/cargo-lambda-invoke/Cargo.toml index ec7d9e3a..035c8969 100644 --- a/crates/cargo-lambda-invoke/Cargo.toml +++ b/crates/cargo-lambda-invoke/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cargo-lambda-invoke" description = "Cargo subcommand to work with AWS Lambda" -version = "0.9.0" +version = "0.10.0" edition = "2021" license = "MIT" readme = "README.md" @@ -16,7 +16,7 @@ rust-version = "1.59.0" # add the latest version of a dependency to the list, # and it will keep the alphabetic ordering for you. [dependencies] -cargo-lambda-remote = { version = "0.9.0", path = "../cargo-lambda-remote" } +cargo-lambda-remote = { version = "0.10.0", path = "../cargo-lambda-remote" } clap = { version = "3.1.18", features = ["derive"] } dirs = "4.0.0" miette = "4.7.1" diff --git a/crates/cargo-lambda-metadata/Cargo.toml b/crates/cargo-lambda-metadata/Cargo.toml index fc85bc97..e5b0dcec 100644 --- a/crates/cargo-lambda-metadata/Cargo.toml +++ b/crates/cargo-lambda-metadata/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cargo-lambda-metadata" description = "Cargo subcommand to work with AWS Lambda" -version = "0.9.0" +version = "0.10.0" edition = "2021" license = "MIT" readme = "README.md" diff --git a/crates/cargo-lambda-new/Cargo.toml b/crates/cargo-lambda-new/Cargo.toml index b74a454a..607b180f 100644 --- a/crates/cargo-lambda-new/Cargo.toml +++ b/crates/cargo-lambda-new/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cargo-lambda-new" description = "Cargo subcommand to work with AWS Lambda" -version = "0.9.0" +version = "0.10.0" edition = "2021" license = "MIT" readme = "README.md" @@ -16,8 +16,8 @@ rust-version = "1.59.0" # add the latest version of a dependency to the list, # and it will keep the alphabetic ordering for you. [dependencies] -cargo-lambda-interactive = { version = "0.9.0", path = "../cargo-lambda-interactive" } -cargo-lambda-metadata = { version = "0.9.0", path = "../cargo-lambda-metadata" } +cargo-lambda-interactive = { version = "0.10.0", path = "../cargo-lambda-interactive" } +cargo-lambda-metadata = { version = "0.10.0", path = "../cargo-lambda-metadata" } clap = { version = "3.1.18", features = ["derive"] } liquid = "0.26.0" miette = "4.7.1" diff --git a/crates/cargo-lambda-new/src/lib.rs b/crates/cargo-lambda-new/src/lib.rs index ad944731..a26ab4bf 100644 --- a/crates/cargo-lambda-new/src/lib.rs +++ b/crates/cargo-lambda-new/src/lib.rs @@ -349,7 +349,7 @@ impl New { } } -#[tracing::instrument(level = "debug")] +#[tracing::instrument(level = "debug", target = "cargo_lambda")] async fn download_template(url: &str, path: &Path) -> Result<()> { tracing::debug!("downloading template"); @@ -424,7 +424,7 @@ fn is_local_zip_file(path: &str) -> bool { path.exists() && path.is_file() && path.extension().unwrap_or_default() == "zip" } -#[tracing::instrument(level = "debug")] +#[tracing::instrument(level = "debug", target = "cargo_lambda")] fn unzip_template(file: PathBuf, path: &Path) -> Result<()> { tracing::debug!("extracting template from ZIP file"); diff --git a/crates/cargo-lambda-remote/Cargo.toml b/crates/cargo-lambda-remote/Cargo.toml index 9899568b..ec5f163e 100644 --- a/crates/cargo-lambda-remote/Cargo.toml +++ b/crates/cargo-lambda-remote/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cargo-lambda-remote" description = "Cargo subcommand to work with AWS Lambda" -version = "0.9.0" +version = "0.10.0" edition = "2021" license = "MIT" readme = "README.md" diff --git a/crates/cargo-lambda-watch/Cargo.toml b/crates/cargo-lambda-watch/Cargo.toml index 19c73d0e..7425f9cf 100644 --- a/crates/cargo-lambda-watch/Cargo.toml +++ b/crates/cargo-lambda-watch/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cargo-lambda-watch" description = "Cargo subcommand to work with AWS Lambda" -version = "0.9.0" +version = "0.10.0" edition = "2021" license = "MIT" readme = "README.md" @@ -19,9 +19,9 @@ rust-version = "1.59.0" aws_lambda_events = { version = "0.6.3", features = ["apigw"] } axum = "0.5.4" base64 = "0.13.0" -cargo-lambda-interactive = { version = "0.9.0", path = "../cargo-lambda-interactive" } -cargo-lambda-invoke = { version = "0.9.0", path = "../cargo-lambda-invoke" } -cargo-lambda-metadata = { version = "0.9.0", path = "../cargo-lambda-metadata" } +cargo-lambda-interactive = { version = "0.10.0", path = "../cargo-lambda-interactive" } +cargo-lambda-invoke = { version = "0.10.0", path = "../cargo-lambda-invoke" } +cargo-lambda-metadata = { version = "0.10.0", path = "../cargo-lambda-metadata" } chrono = "0.4.19" clap = { version = "3.1.18", features = ["derive"] } home = "0.5.3"