Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into jdisanti-upload-min-t…
Browse files Browse the repository at this point in the history
…hroughput
  • Loading branch information
jdisanti committed Mar 25, 2024
2 parents 7363504 + 2561e01 commit 0f1e009
Show file tree
Hide file tree
Showing 51 changed files with 1,666 additions and 1,120 deletions.
9 changes: 5 additions & 4 deletions .github/actions/docker-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ inputs:
runs:
using: composite
steps:
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Gradle Cache
with:
path: |
Expand All @@ -24,8 +24,8 @@ runs:
key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/caches/**/*', 'gradle/wrapper/**/*') }}
restore-keys: |
${{ runner.os }}-gradle-
# Pinned to the commit hash of v2.1.0
- uses: Swatinem/rust-cache@b894d59a8d236e2979b247b80dac8d053ab340dd
# Pinned to the commit hash of v2.7.3
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
with:
shared-key: ${{ runner.os }}-${{ github.job }}
workspaces: |
Expand Down Expand Up @@ -60,9 +60,10 @@ runs:
./smithy-rs/tools/ci-build/ci-action ${{ inputs.action }} ${{ inputs.action-arguments}}
tar cfz artifacts-${{ inputs.action }}.tar.gz -C artifacts .
- name: Upload artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: artifacts-${{ inputs.action }}
path: artifacts-${{ inputs.action }}.tar.gz
if-no-files-found: error
retention-days: 3
overwrite: true
2 changes: 1 addition & 1 deletion .github/actions/download-all-artifacts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
using: composite
steps:
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
- name: Untar artifacts
shell: bash
run: find . -maxdepth 2 -iname 'artifacts-*.tar.gz' -print -exec tar xfz {} \;
14 changes: 14 additions & 0 deletions .github/workflows/canary.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

name: Canary
on:
workflow_dispatch:

jobs:
canary:
name: Canary
runs-on: ubuntu-latest
steps:
- name: Invoke canary in aws-sdk-rust
run: echo "Hello World"
4 changes: 2 additions & 2 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
contents: read
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Acquire credentials
uses: aws-actions/configure-aws-credentials@v2.2.0
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
role-session-name: GitHubActions
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-merge-queue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Attempt to load a docker login password
uses: aws-actions/configure-aws-credentials@v2.2.0
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
role-session-name: GitHubActions
Expand All @@ -58,7 +58,7 @@ jobs:
id-token: write
contents: read
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: smithy-rs
- name: Acquire base image
Expand All @@ -67,7 +67,7 @@ jobs:
DOCKER_BUILDKIT: 1
run: ./smithy-rs/.github/scripts/acquire-build-image
- name: Acquire credentials
uses: aws-actions/configure-aws-credentials@v2.2.0
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
role-session-name: GitHubActions
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-pr-forks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
if: ${{ github.event.pull_request.head.repo.full_name != 'smithy-lang/smithy-rs' }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: smithy-rs
- name: Acquire base image
Expand All @@ -30,7 +30,7 @@ jobs:
DOCKER_BUILDKIT: 1
run: ./smithy-rs/.github/scripts/acquire-build-image
- name: Upload base image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: smithy-rs-base-image
path: smithy-rs-base-image
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Attempt to load a docker login password
uses: aws-actions/configure-aws-credentials@v2.2.0
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
role-session-name: GitHubActions
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
id-token: write
contents: read
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: smithy-rs
- name: Acquire base image
Expand All @@ -69,7 +69,7 @@ jobs:
DOCKER_BUILDKIT: 1
run: ./smithy-rs/.github/scripts/acquire-build-image
- name: Acquire credentials
uses: aws-actions/configure-aws-credentials@v2.2.0
uses: aws-actions/configure-aws-credentials@v4
with:
role-to-assume: ${{ secrets.SMITHY_RS_PUBLIC_ECR_PUSH_ROLE_ARN }}
role-session-name: GitHubActions
Expand Down Expand Up @@ -121,13 +121,13 @@ jobs:
!contains(needs.*.result, 'failure') &&
!contains(needs.*.result, 'cancelled')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: smithy-rs
ref: ${{ inputs.git_ref }}
- name: Get PR info
id: check-breaking-label
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const response = await github.rest.pulls.get({
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-tls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ jobs:
- name: Stop nginx
run: sudo systemctl stop nginx
- name: Checkout smithy-rs
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ./smithy-rs
- name: Checkout trytls
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: ouspg/trytls
path: ./trytls
- name: Checkout badtls
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: wbond/badtls.io
path: ./badtls.io
- name: Checkout badssl
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: chromium/badssl.com
path: ./badssl.com
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ jobs:
- action: generate-aws-sdk-smoketest
- action: generate-smithy-rs-release
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: smithy-rs
ref: ${{ inputs.git_ref }}
# The models from aws-sdk-rust are needed to generate the full SDK for CI
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: awslabs/aws-sdk-rust
path: aws-sdk-rust
# The examples from aws-doc-sdk-examples are needed to see if smithy-rs changes break examples
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
repository: awsdocs/aws-doc-sdk-examples
path: aws-doc-sdk-examples
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
- action: check-deterministic-codegen
runner: smithy_ubuntu-latest_8-core
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: smithy-rs
ref: ${{ inputs.git_ref }}
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
- action: check-aws-sdk-standalone-integration-tests
runner: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: smithy-rs
ref: ${{ inputs.git_ref }}
Expand All @@ -175,11 +175,11 @@ jobs:
RUSTDOCFLAGS: -D warnings
RUSTFLAGS: -D warnings
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ inputs.git_ref }}
# Pinned to the commit hash of v2.1.0
- uses: Swatinem/rust-cache@b894d59a8d236e2979b247b80dac8d053ab340dd
# Pinned to the commit hash of v2.7.3
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
with:
shared-key: ${{ runner.os }}-${{ env.rust_version }}-${{ github.job }}
workspaces: |
Expand Down Expand Up @@ -234,11 +234,11 @@ jobs:
CROSS_CONFIG: Cross.toml
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.git_ref }}
# Pinned to the commit hash of v2.1.0
- uses: Swatinem/rust-cache@b894d59a8d236e2979b247b80dac8d053ab340dd
# Pinned to the commit hash of v2.7.3
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84
with:
shared-key: ${{ runner.os }}-${{ env.rust_version }}-${{ github.job }}-${{ matrix.target }}
workspaces: |
Expand Down Expand Up @@ -302,7 +302,7 @@ jobs:
needs: generate
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: smithy-rs
ref: ${{ inputs.git_ref }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/claim-crate-names.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
steps:
- name: Main branch check
if: ${{ github.ref_name != 'main' }}
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
core.setFailed("This workflow can only be ran on main (current branch: ${{ github.ref_name }})")
Expand All @@ -39,15 +39,15 @@ jobs:
- main-branch-check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: smithy-rs
fetch-depth: 0
- name: Acquire base image
id: acquire
run: ./smithy-rs/.github/scripts/acquire-build-image
- name: Upload base image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: smithy-rs-base-image
path: smithy-rs-base-image
Expand All @@ -65,11 +65,11 @@ jobs:
with:
toolchain: ${{ env.rust_version }}
- name: Checkout smithy-rs
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Publish to crates.io
shell: bash
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.RELEASE_AUTOMATION_BOT_CRATESIO_TOKEN }}
CARGO_REGISTRY_TOKEN: ${{ secrets.RELEASE_AUTOMATION_BOT_CRATESIO_TOKEN }}
run: |
cargo install --path tools/ci-build/publisher
# Verify the publisher tool installed successfully
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/credentials-verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout smithy-rs
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Verify Crates.io Token
shell: bash
env:
Expand All @@ -38,7 +38,7 @@ jobs:
steps:
- name: Checkout smithy-rs
# To test the validity of the personal access token, we only need to perform checkout with the specified token.
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }}
- name: Notify Slack on Failure
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
persist-credentials: false
- uses: dtolnay/rust-toolchain@master
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/manual-pull-request-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- name: Get PR info
id: get-pr-info
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const response = await github.rest.pulls.get({
Expand All @@ -42,7 +42,7 @@ jobs:
- get-pr-info
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
path: smithy-rs
# The ref used needs to match the HEAD revision of the PR being diffed, or else
Expand All @@ -55,7 +55,7 @@ jobs:
id: acquire
run: ./smithy-rs/.github/scripts/acquire-build-image
- name: Upload base image
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: smithy-rs-base-image
path: smithy-rs-base-image
Expand Down
Loading

0 comments on commit 0f1e009

Please sign in to comment.