Skip to content

Commit cb30bef

Browse files
unexgercoh
authored andcommitted
Execute Python's diff commands inside correct directory (#2568)
1 parent 442d240 commit cb30bef

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

tools/ci-scripts/codegen-diff/codegen-diff-revisions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#
2121
# ```
2222
# $ cd test/smithy-rs
23-
# $ ../../smithy-rs/tools/ci-scripts/codegen-diff-revisions.py . <some commit hash to diff against>
23+
# $ ../../smithy-rs/tools/ci-scripts/codegen-diff/codegen-diff-revisions.py . <some commit hash to diff against>
2424
# ```
2525
#
2626
# It will diff the generated code from HEAD against any commit hash you feed it. If you want to test

tools/ci-scripts/codegen-diff/diff_lib.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
CDN_URL = "https://d2luzm2xt3nokh.cloudfront.net"
1717

18+
PYTHON_EXAMPLES_PATH = "rust-runtime/aws-smithy-http-server-python/examples"
19+
1820
target_codegen_client = 'codegen-client-test'
1921
target_codegen_server = 'codegen-server-test'
2022
target_aws_sdk = 'aws:sdk'
@@ -40,14 +42,14 @@ def generate_and_commit_generated_code(revision_sha, targets=None):
4042
# Clean the build artifacts before continuing
4143
get_cmd_output("rm -rf aws/sdk/build")
4244
if target_codegen_server in targets:
43-
get_cmd_output("cd rust-runtime/aws-smithy-http-server-python/examples && make distclean", shell=True)
45+
get_cmd_output("make distclean", shell=True, cwd=PYTHON_EXAMPLES_PATH)
4446
get_cmd_output("./gradlew codegen-core:clean codegen-client:clean codegen-server:clean aws:sdk-codegen:clean")
4547

4648
# Generate code
4749
tasks = ' '.join([f'{t}:assemble' for t in targets])
4850
get_cmd_output(f"./gradlew --rerun-tasks {tasks}")
4951
if target_codegen_server in targets:
50-
get_cmd_output("cd rust-runtime/aws-smithy-http-server-python/examples && make build", shell=True, check=False)
52+
get_cmd_output("make build", shell=True, check=False, cwd=PYTHON_EXAMPLES_PATH)
5153
get_cmd_output(f"./gradlew --rerun-tasks codegen-server-test:typescript:assemble")
5254

5355
# Move generated code into codegen-diff/ directory
@@ -60,7 +62,7 @@ def generate_and_commit_generated_code(revision_sha, targets=None):
6062
get_cmd_output(f"mv {target}/build/smithyprojections/{target} {OUTPUT_PATH}/")
6163
if target == target_codegen_server:
6264
get_cmd_output(
63-
f"mv rust-runtime/aws-smithy-http-server-python/examples/pokemon-service-server-sdk/ {OUTPUT_PATH}/codegen-server-test-python/",
65+
f"mv {PYTHON_EXAMPLES_PATH}/pokemon-service-server-sdk/ {OUTPUT_PATH}/codegen-server-test-python/",
6466
check=False)
6567
get_cmd_output(
6668
f"mv codegen-server-test/typescript/build/smithyprojections/codegen-server-test-typescript {OUTPUT_PATH}/",

0 commit comments

Comments
 (0)