From 1c445774d00df7a049e05eae9af21cd01b95a990 Mon Sep 17 00:00:00 2001 From: ysaito1001 Date: Wed, 6 Dec 2023 17:00:41 -0600 Subject: [PATCH] Use a `rustv1` directory from `aws-doc-sdk-examples` (#3287) ## Motivation and Context This PR is a cleanup after https://github.com/smithy-lang/smithy-rs/pull/3115, fully switching to `rustv1` for the rust example directory in [aws-doc-sdk-examples](https://github.com/awsdocs/aws-doc-sdk-examples). ---- _By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice._ --- .github/workflows/ci.yml | 1 - tools/ci-build/sdk-versioner/README.md | 4 ++-- tools/ci-scripts/generate-aws-sdk | 7 +------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68205ac234..c56ec564cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,6 @@ jobs: with: repository: awsdocs/aws-doc-sdk-examples path: aws-doc-sdk-examples - ref: rust-launch - name: Run ${{ matrix.actions.action }} uses: ./smithy-rs/.github/actions/docker-build with: diff --git a/tools/ci-build/sdk-versioner/README.md b/tools/ci-build/sdk-versioner/README.md index 1d43054466..45247fd4c5 100644 --- a/tools/ci-build/sdk-versioner/README.md +++ b/tools/ci-build/sdk-versioner/README.md @@ -12,12 +12,12 @@ Example updating SDK examples to use SDK version 0.5.0 with Smithy version 0.35. $ sdk-versioner \ --sdk-version 0.5.0 \ --smithy-version 0.35.0 \ - path/to/aws-doc-sdk-examples/rust + path/to/aws-doc-sdk-examples/rustv1 ``` Example updating SDK examples to refer to local generated code: ```bash $ sdk-versioner \ --sdk-path path/to/smithy-rs/aws/sdk/build/aws-sdk/sdk \ - path/to/aws-doc-sdk-examples/rust + path/to/aws-doc-sdk-examples/rustv1 ``` diff --git a/tools/ci-scripts/generate-aws-sdk b/tools/ci-scripts/generate-aws-sdk index 36db805639..b9766cec27 100755 --- a/tools/ci-scripts/generate-aws-sdk +++ b/tools/ci-scripts/generate-aws-sdk @@ -23,12 +23,7 @@ fi echo -e "${C_YELLOW}Taking examples from 'awsdocs/aws-doc-sdk-examples'...${C_RESET}" examples_revision=$(cd aws-doc-sdk-examples; git rev-parse HEAD) -# TODO(removeSdkExamplesDevPreview): One release after `rust_dev_preview` is renamed to `rust`, this check can be cleaned up -if [[ -d "aws-doc-sdk-examples/rust" ]]; then - mv aws-doc-sdk-examples/rust smithy-rs/aws/sdk/examples -else - mv aws-doc-sdk-examples/rust_dev_preview smithy-rs/aws/sdk/examples -fi +mv aws-doc-sdk-examples/rustv1 smithy-rs/aws/sdk/examples rm -rf smithy-rs/aws/sdk/examples/.cargo echo -e "${C_YELLOW}Creating empty model metadata file since we don't have model update information...${C_RESET}"