Skip to content

Commit

Permalink
Merge branch 'main' into zhessler/request-compression
Browse files Browse the repository at this point in the history
  • Loading branch information
aws-sdk-rust-ci authored May 21, 2024
2 parents 5a9a26b + 68933b7 commit f730c9a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ Project Layout
* `aws`: AWS specific codegen & Rust code (signing, endpoints, customizations, etc.)
Common commands:
* `./gradlew :aws:sdk:assemble`: Generate (but do not test / compile etc.) a fresh SDK into `sdk/build/aws-sdk`
* `./gradlew :aws:sdk:test`: Generate & run all tests for a fresh SDK
* `./gradlew :aws:sdk:sdkTest`: Generate & run all tests for a fresh SDK. (Note that these tests require Go to be
installed for FIP support to compile properly)
* `./gradlew :aws:sdk:{cargoCheck, cargoTest, cargoDocs, cargoClippy}`: Generate & run specified cargo command.
* `codegen-core`: Common code generation logic useful for clients and servers
* `codegen-client`: Whitelabel Smithy client code generation
Expand Down Expand Up @@ -123,7 +124,7 @@ to generate more or less AWS service clients.
# Generate an SDK, but do not attempt to compile / run tests. Useful for inspecting generated code
./gradlew :aws:sdk:assemble
# Run all the tests
./gradlew :aws:sdk:test
./gradlew :aws:sdk:sdkTest
# Validate that the generated code compiles
./gradlew :aws:sdk:cargoCheck
# Validate that the generated code passes Clippy
Expand Down
8 changes: 6 additions & 2 deletions aws/sdk/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,12 @@ tasks["assemble"].apply {
project.registerCargoCommandsTasks(outputDir.asFile, defaultRustDocFlags)
project.registerGenerateCargoConfigTomlTask(outputDir.asFile)

tasks["test"].dependsOn("assemble")
tasks["test"].finalizedBy(Cargo.CLIPPY.toString, Cargo.TEST.toString, Cargo.DOCS.toString)
//The task name "test" is already registered by one of our plugins
tasks.register("sdkTest") {
description = "Run Cargo clippy/test/docs against the generated SDK."
dependsOn("assemble")
finalizedBy(Cargo.CLIPPY.toString, Cargo.TEST.toString, Cargo.DOCS.toString)
}

tasks.register<Delete>("deleteSdk") {
delete(
Expand Down

0 comments on commit f730c9a

Please sign in to comment.