Unverified Commit 63b1de1a authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Update pinned nightly to fix `cargo udeps` checks (#1285) 

* Update pinned nightly to fix `cargo udeps` checks

* Update `api-linter` to work on `nightly-2022-03-29`

* Make it possible to test tool modifications in a pull request
parent bd38d0dd

.github/workflows/ci-docker-build.yml

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ jobs: 
    - name: Build image

      run: |

        IMAGE_TAG="$(git rev-parse HEAD)"

        cd tools/ci-build

        docker build -t "${{ env.ecr_repository }}:${IMAGE_TAG}" --file base-image.dockerfile .

        cd tools

        docker build -t "${{ env.ecr_repository }}:${IMAGE_TAG}" .

    - name: Acquire credentials

      uses: aws-actions/configure-aws-credentials@v1

      with:

rust-runtime/aws-smithy-types/additional-ci

+1 −1
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ echo "### Checking for duplicate dependency versions in the normal dependency gr 
cargo tree -d --edges normal --all-features



echo "### Running api-linter"

cargo +nightly-2022-03-03 api-linter --all-features
 
cargo "+${RUST_NIGHTLY_VERSION}" api-linter --all-features

tools/.dockerignore

0 → 100644
+4 −0
Original line number Diff line number Diff line 
/target

/ci-cdk/build

node_modules

cdk.out

tools/ci-build/base-image.dockerfile→tools/Dockerfile

+14 −7
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.

# SPDX-License-Identifier: Apache-2.0.

#



# This is the base Docker build image used by CI



ARG base_image=public.ecr.aws/amazonlinux/amazonlinux:2

FROM ${base_image} AS bare_base_image
@@ -36,10 +39,12 @@ RUN set -eux; \ 
#

FROM bare_base_image AS install_rust

ARG rust_stable_version=1.56.1

ARG rust_nightly_version=nightly-2022-03-03

ARG rust_nightly_version=nightly-2022-03-29

ARG cargo_udeps_version=0.1.27

ARG cargo_hack_version=0.5.12

ARG smithy_rs_revision=main

# If the `checkout_smithy_rs_tools` arg is set to true, then the Dockerfile will acquire the tools

# source code by checking out awslabs/smithy-rs/main rather than copying them from the local directory.

ARG checkout_smithy_rs_tools=false

ENV RUSTUP_HOME=/opt/rustup \

    CARGO_HOME=/opt/cargo \

    PATH=/opt/cargo/bin/:${PATH} \
@@ -71,12 +76,14 @@ RUN set -eux; \ 
    rustup install ${rust_nightly_version}; \

    cargo --version; \

    cargo +${rust_nightly_version} --version;

COPY . tools/

RUN set -eux; \

    cargo +${rust_nightly_version} install cargo-udeps --version ${cargo_udeps_version}; \

    cargo install cargo-hack --version ${cargo_hack_version}; \

    if [[ "${checkout_smithy_rs_tools}" == "true" ]]; then \

        git clone https://github.com/awslabs/smithy-rs.git; \

        cd smithy-rs; \

    git checkout ${smithy_rs_revision}; \

    fi; \

    cargo install --path tools/publisher; \

    cargo +${rust_nightly_version} install --path tools/api-linter; \

    cargo install --path tools/sdk-lints; \
@@ -88,7 +95,7 @@ RUN set -eux; \ 
#

FROM bare_base_image AS final_image

ARG rust_stable_version=1.56.1

ARG rust_nightly_version=nightly-2022-03-03

ARG rust_nightly_version=nightly-2022-03-29

RUN set -eux; \

    yum -y updateinfo; \

    yum -y install \
@@ -120,5 +127,5 @@ ENV PATH=/opt/cargo/bin:/opt/nodejs/bin:$PATH \ 
    RUSTFLAGS="-D warnings" \

    SMITHY_RS_DOCKER_BUILD_IMAGE=1

WORKDIR /home/build

COPY scripts/sanity-test /home/build/sanity-test

COPY ci-build/scripts/sanity-test /home/build/sanity-test

RUN /home/build/sanity-test

tools/api-linter/Cargo.lock

+2 −2
Original line number Diff line number Diff line
@@ -363,9 +363,9 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" 


[[package]]

name = "rustdoc-types"

version = "0.7.0"

version = "0.10.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "83828d28c3b4f860bd077db7fd1b18a730bf393be650a5be997820d5e63935ea"

checksum = "5cd93f56979d38715bf1012600fd3253525d4069b37282425e32a789a3b55748"

dependencies = [

 "serde",

]