Skip to content

Commit

Permalink
Merge branch 'main' into harryb/restore-into-make-service-with-connec…
Browse files Browse the repository at this point in the history
…t-info
  • Loading branch information
hlbarber authored Nov 30, 2022
2 parents 93a1912 + 2226fef commit 3fbb46f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
6 changes: 5 additions & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,13 @@
# Server
/codegen-server-test/ @awslabs/smithy-rs-server
/codegen-server/ @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-http-server-python/ @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-http-server/ @awslabs/smithy-rs-server

# Python Server
/codegen-server-test/python/ @awslabs/smithy-rs-python-server @awslabs/smithy-rs-server
/codegen-server/python/ @awslabs/smithy-rs-python-server @awslabs/smithy-rs-server
/rust-runtime/aws-smithy-http-server-python/ @awslabs/smithy-rs-python-server @awslabs/smithy-rs-server

# Shared ownership
/.github/ @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
/CHANGELOG.md @awslabs/rust-sdk-owners @awslabs/smithy-rs-server
Expand Down
14 changes: 7 additions & 7 deletions tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ RUN set -eux; \
#
FROM bare_base_image AS install_rust
ARG rust_stable_version=1.62.1
ARG rust_nightly_version=nightly-2022-07-25
ARG cargo_deny_version=0.12.2
ARG cargo_udeps_version=0.1.29
ARG cargo_hack_version=0.5.14
ARG cargo_minimal_versions_version=0.1.4
ARG cargo_check_external_types_version=0.1.5
ARG rust_nightly_version=nightly-2022-11-16
ARG cargo_deny_version=0.13.5
ARG cargo_udeps_version=0.1.35
ARG cargo_hack_version=0.5.23
ARG cargo_minimal_versions_version=0.1.8
ARG cargo_check_external_types_version=0.1.6
ENV RUSTUP_HOME=/opt/rustup \
CARGO_HOME=/opt/cargo \
PATH=/opt/cargo/bin/:${PATH} \
Expand Down Expand Up @@ -118,7 +118,7 @@ RUN set -eux; \
#
FROM bare_base_image AS final_image
ARG rust_stable_version=1.62.1
ARG rust_nightly_version=nightly-2022-07-25
ARG rust_nightly_version=nightly-2022-11-16
RUN set -eux; \
yum -y updateinfo; \
yum -y install \
Expand Down

0 comments on commit 3fbb46f

Please sign in to comment.