From 210b9c855bcf25c38c9bbecc6da8ab36e9eb7b4a Mon Sep 17 00:00:00 2001 From: Thomas Cameron Date: Sun, 16 Jul 2023 11:45:38 +0000 Subject: [PATCH 01/12] asdf --- tools/ci-scripts/check-aws-sdk-adhoc-tests | 2 ++ tools/ci-scripts/check-aws-sdk-orchestrator-impl | 2 ++ tools/ci-scripts/check-aws-sdk-smoketest-docs-clippy-udeps | 2 ++ tools/ci-scripts/check-aws-sdk-smoketest-unit-tests | 3 +++ tools/ci-scripts/check-client-codegen-integration-tests | 3 +++ tools/ci-scripts/check-only-aws-sdk-services | 3 +++ 6 files changed, 15 insertions(+) diff --git a/tools/ci-scripts/check-aws-sdk-adhoc-tests b/tools/ci-scripts/check-aws-sdk-adhoc-tests index 911d11f998d..7ccb54a7163 100755 --- a/tools/ci-scripts/check-aws-sdk-adhoc-tests +++ b/tools/ci-scripts/check-aws-sdk-adhoc-tests @@ -7,6 +7,8 @@ C_YELLOW='\033[1;33m' C_RESET='\033[0m' +export RUSTFLAG="--cfg aws_sdk_unstable" + set -eu cd smithy-rs diff --git a/tools/ci-scripts/check-aws-sdk-orchestrator-impl b/tools/ci-scripts/check-aws-sdk-orchestrator-impl index b86ebf3f0f6..04a9fe7aa1f 100755 --- a/tools/ci-scripts/check-aws-sdk-orchestrator-impl +++ b/tools/ci-scripts/check-aws-sdk-orchestrator-impl @@ -9,6 +9,8 @@ C_YELLOW='\033[1;33m' C_RESET='\033[0m' +export RUSTFLAG="--cfg aws_sdk_unstable" + set -eu cd smithy-rs diff --git a/tools/ci-scripts/check-aws-sdk-smoketest-docs-clippy-udeps b/tools/ci-scripts/check-aws-sdk-smoketest-docs-clippy-udeps index 38942ef0678..af6e0dd3943 100755 --- a/tools/ci-scripts/check-aws-sdk-smoketest-docs-clippy-udeps +++ b/tools/ci-scripts/check-aws-sdk-smoketest-docs-clippy-udeps @@ -6,6 +6,8 @@ set -eux +export RUSTFLAG="--cfg aws_sdk_unstable" + # Docs, clippy, etc on the smoketest itself pushd aws-sdk-smoketest &>/dev/null diff --git a/tools/ci-scripts/check-aws-sdk-smoketest-unit-tests b/tools/ci-scripts/check-aws-sdk-smoketest-unit-tests index 293af9b43f1..a04af9e87d0 100755 --- a/tools/ci-scripts/check-aws-sdk-smoketest-unit-tests +++ b/tools/ci-scripts/check-aws-sdk-smoketest-unit-tests @@ -5,5 +5,8 @@ # set -eux + +export RUSTFLAG="--cfg aws_sdk_unstable" + cd aws-sdk-smoketest cargo test --all-features diff --git a/tools/ci-scripts/check-client-codegen-integration-tests b/tools/ci-scripts/check-client-codegen-integration-tests index 86013436c51..32112445f23 100755 --- a/tools/ci-scripts/check-client-codegen-integration-tests +++ b/tools/ci-scripts/check-client-codegen-integration-tests @@ -5,6 +5,9 @@ # set -eux + +export RUSTFLAG="--cfg aws_sdk_unstable" + cd smithy-rs # TODO(enableNewSmithyRuntimeCleanup): Only run the orchestrator version of this diff --git a/tools/ci-scripts/check-only-aws-sdk-services b/tools/ci-scripts/check-only-aws-sdk-services index b15c4133b3d..17d90b2ef9e 100755 --- a/tools/ci-scripts/check-only-aws-sdk-services +++ b/tools/ci-scripts/check-only-aws-sdk-services @@ -7,6 +7,9 @@ # this job runs `cargo check` only instead of `cargo test --all-features` set -eux + +export RUSTFLAG="--cfg aws_sdk_unstable" + cd aws-sdk # Remove examples from workspace From 19d542915676e377168ac0d697cd77f751c72191 Mon Sep 17 00:00:00 2001 From: Thomas Cameron Date: Fri, 8 Dec 2023 02:23:50 +0900 Subject: [PATCH 02/12] Update check-aws-sdk-orchestrator-impl --- tools/ci-scripts/check-aws-sdk-orchestrator-impl | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/ci-scripts/check-aws-sdk-orchestrator-impl b/tools/ci-scripts/check-aws-sdk-orchestrator-impl index 04a9fe7aa1f..b86ebf3f0f6 100755 --- a/tools/ci-scripts/check-aws-sdk-orchestrator-impl +++ b/tools/ci-scripts/check-aws-sdk-orchestrator-impl @@ -9,8 +9,6 @@ C_YELLOW='\033[1;33m' C_RESET='\033[0m' -export RUSTFLAG="--cfg aws_sdk_unstable" - set -eu cd smithy-rs From 0de2482109f954297c20aeecacef367c806db305 Mon Sep 17 00:00:00 2001 From: Thomas K Cameron Date: Thu, 21 Dec 2023 03:38:01 +0900 Subject: [PATCH 03/12] update --- .github/workflows/ci.yml | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c56ec564cfd..6fe5c6725d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -161,7 +161,42 @@ jobs: with: action: ${{ matrix.test.action }} - + test-sdk: + name: Test the SDK with `aws_sdk_unstable` on. + needs: generate + runs-on: ${{ matrix.test.runner }} + # To avoid repeating setup boilerplate, we have the actual test commands + # in a matrix strategy. These commands get run in the steps after all the setup. + strategy: + fail-fast: false + matrix: + env: + RUSTFLAGS: --cfg aws_sdk_unstable + # These correspond to scripts in tools/ci-scripts that will be run in the Docker build image + test: + - action: check-aws-config + runner: smithy_ubuntu-latest_8-core + - action: check-aws-sdk-canary + runner: ubuntu-latest + - action: check-aws-sdk-cargo-deny + runner: ubuntu-latest + - action: check-only-aws-sdk-services + runner: smithy_ubuntu-latest_8-core + - action: check-aws-sdk-smoketest-docs-clippy-udeps + runner: smithy_ubuntu-latest_8-core + - action: check-aws-sdk-smoketest-unit-tests + runner: smithy_ubuntu-latest_8-core + - action: check-aws-sdk-standalone-integration-tests + runner: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + path: smithy-rs + ref: ${{ inputs.git_ref }} + - name: Run ${{ matrix.test.action }} + uses: ./smithy-rs/.github/actions/docker-build + with: + action: ${{ matrix.test.action }} test-rust-windows: name: Rust Tests on Windows From de20006bb19a08836984cff359999b7103200881 Mon Sep 17 00:00:00 2001 From: Thomas K Cameron Date: Thu, 21 Dec 2023 03:38:52 +0900 Subject: [PATCH 04/12] update --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6fe5c6725d1..c6520a25a9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -161,8 +161,8 @@ jobs: with: action: ${{ matrix.test.action }} - test-sdk: - name: Test the SDK with `aws_sdk_unstable` on. + test-with-serde: + name: Test the SDK with `serde` feature enabled. needs: generate runs-on: ${{ matrix.test.runner }} # To avoid repeating setup boilerplate, we have the actual test commands From ce09a273f60b074e1d615e760e945342bca33274 Mon Sep 17 00:00:00 2001 From: Thomas K Cameron Date: Thu, 21 Dec 2023 03:41:38 +0900 Subject: [PATCH 05/12] update --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6520a25a9c..6d8bf49e65e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -165,13 +165,13 @@ jobs: name: Test the SDK with `serde` feature enabled. needs: generate runs-on: ${{ matrix.test.runner }} + env: + RUSTFLAGS: --cfg aws_sdk_unstable # To avoid repeating setup boilerplate, we have the actual test commands # in a matrix strategy. These commands get run in the steps after all the setup. strategy: fail-fast: false matrix: - env: - RUSTFLAGS: --cfg aws_sdk_unstable # These correspond to scripts in tools/ci-scripts that will be run in the Docker build image test: - action: check-aws-config From c515262918522842cfefc9dc3c8033da85244c34 Mon Sep 17 00:00:00 2001 From: Thomas K Cameron Date: Thu, 21 Dec 2023 03:48:15 +0900 Subject: [PATCH 06/12] update --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d8bf49e65e..b640235ab59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -167,6 +167,8 @@ jobs: runs-on: ${{ matrix.test.runner }} env: RUSTFLAGS: --cfg aws_sdk_unstable + CARGO_FEATURE_SERDE_SERIALIZE: true + CARGO_FEATURE_SERDE_DESERIALIZE: true # To avoid repeating setup boilerplate, we have the actual test commands # in a matrix strategy. These commands get run in the steps after all the setup. strategy: From cf7e806d69fda993de430e8a584da9fcbb7c1d47 Mon Sep 17 00:00:00 2001 From: Thomas Cameron Date: Thu, 21 Dec 2023 04:20:51 +0900 Subject: [PATCH 07/12] Update check-aws-sdk-adhoc-tests --- tools/ci-scripts/check-aws-sdk-adhoc-tests | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/ci-scripts/check-aws-sdk-adhoc-tests b/tools/ci-scripts/check-aws-sdk-adhoc-tests index d49b31c974f..8da33d14de7 100755 --- a/tools/ci-scripts/check-aws-sdk-adhoc-tests +++ b/tools/ci-scripts/check-aws-sdk-adhoc-tests @@ -7,8 +7,6 @@ C_YELLOW='\033[1;33m' C_RESET='\033[0m' -export RUSTFLAG="--cfg aws_sdk_unstable" - set -eu cd smithy-rs From 7344ed342e0aeb8c936efbbeb5f699f4b5f46650 Mon Sep 17 00:00:00 2001 From: Thomas Cameron Date: Thu, 21 Dec 2023 04:21:08 +0900 Subject: [PATCH 08/12] Update check-aws-sdk-smoketest-docs-clippy-udeps --- tools/ci-scripts/check-aws-sdk-smoketest-docs-clippy-udeps | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/ci-scripts/check-aws-sdk-smoketest-docs-clippy-udeps b/tools/ci-scripts/check-aws-sdk-smoketest-docs-clippy-udeps index 69df6ce21c5..b3b0ade515d 100755 --- a/tools/ci-scripts/check-aws-sdk-smoketest-docs-clippy-udeps +++ b/tools/ci-scripts/check-aws-sdk-smoketest-docs-clippy-udeps @@ -6,8 +6,6 @@ set -eux -export RUSTFLAG="--cfg aws_sdk_unstable" - # Docs, clippy, etc on the smoketest itself pushd aws-sdk-smoketest &>/dev/null From d88243a886b032fd75d70285b2d80b76c4340001 Mon Sep 17 00:00:00 2001 From: Thomas Cameron Date: Thu, 21 Dec 2023 04:21:18 +0900 Subject: [PATCH 09/12] Update check-client-codegen-integration-tests --- tools/ci-scripts/check-client-codegen-integration-tests | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/ci-scripts/check-client-codegen-integration-tests b/tools/ci-scripts/check-client-codegen-integration-tests index c0091495efd..f844b0cd0b6 100755 --- a/tools/ci-scripts/check-client-codegen-integration-tests +++ b/tools/ci-scripts/check-client-codegen-integration-tests @@ -5,9 +5,6 @@ # set -eux - -export RUSTFLAG="--cfg aws_sdk_unstable" - cd smithy-rs ./gradlew codegen-client-test:test From fac2f1e28ee4f0a43ed3c01c4249e23e888f0a95 Mon Sep 17 00:00:00 2001 From: Thomas Cameron Date: Thu, 21 Dec 2023 04:21:35 +0900 Subject: [PATCH 10/12] Update check-aws-sdk-smoketest-unit-tests --- tools/ci-scripts/check-aws-sdk-smoketest-unit-tests | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/ci-scripts/check-aws-sdk-smoketest-unit-tests b/tools/ci-scripts/check-aws-sdk-smoketest-unit-tests index 4a9845ffb3f..bbf13d54b35 100755 --- a/tools/ci-scripts/check-aws-sdk-smoketest-unit-tests +++ b/tools/ci-scripts/check-aws-sdk-smoketest-unit-tests @@ -5,9 +5,6 @@ # set -eux - -export RUSTFLAG="--cfg aws_sdk_unstable" - cd aws-sdk-smoketest cargo test --all-features From e9d5e311c283537c3e4a4df583353b9870177ecd Mon Sep 17 00:00:00 2001 From: Thomas Cameron Date: Thu, 21 Dec 2023 04:22:02 +0900 Subject: [PATCH 11/12] Update check-only-aws-sdk-services --- tools/ci-scripts/check-only-aws-sdk-services | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/ci-scripts/check-only-aws-sdk-services b/tools/ci-scripts/check-only-aws-sdk-services index 17d90b2ef9e..2be1535e5c7 100755 --- a/tools/ci-scripts/check-only-aws-sdk-services +++ b/tools/ci-scripts/check-only-aws-sdk-services @@ -8,8 +8,6 @@ set -eux -export RUSTFLAG="--cfg aws_sdk_unstable" - cd aws-sdk # Remove examples from workspace From f2987674806a7d9f2f7e7de7a46b09e22f03c811 Mon Sep 17 00:00:00 2001 From: Thomas Cameron Date: Thu, 21 Dec 2023 04:22:16 +0900 Subject: [PATCH 12/12] Update check-only-aws-sdk-services --- tools/ci-scripts/check-only-aws-sdk-services | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/ci-scripts/check-only-aws-sdk-services b/tools/ci-scripts/check-only-aws-sdk-services index 2be1535e5c7..b15c4133b3d 100755 --- a/tools/ci-scripts/check-only-aws-sdk-services +++ b/tools/ci-scripts/check-only-aws-sdk-services @@ -7,7 +7,6 @@ # this job runs `cargo check` only instead of `cargo test --all-features` set -eux - cd aws-sdk # Remove examples from workspace