Skip to content

Commit

Permalink
Merge branch 'main' into jdisanti-upgrade-msrv
Browse files Browse the repository at this point in the history
  • Loading branch information
jdisanti authored Apr 9, 2024
2 parents d81b4c0 + 8040cce commit c484380
Show file tree
Hide file tree
Showing 14 changed files with 766 additions and 163 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/dry-run-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

# This workflow performs a dry run for smithy-rs release. It can be triggered via either cron or manually.
# When ran, it only produces release artifacts, but will not cut a release tag in GitHub or publish to crates.io.

name: Smithy-rs dry run release
run-name: ${{ github.workflow }} ${{ inputs.commit_sha == '' && 'scheduled' || (inputs.commit_sha) }}
on:
schedule:
# Runs 00:00 UTC every day
- cron: 0 0 * * *
workflow_dispatch:
inputs:
commit_sha:
description: |
Commit SHA: The SHA of the git commit that you want to release.
You must use the non-abbreviated SHA (e.g. b2318b0 won't work!).
Alternatively, you can use the name of a branch.
required: true
type: string

jobs:
smithy-rs-manual-dry-run-release:
name: Manual dry run release
if: ${{ github.event_name == 'workflow_dispatch' }}
uses: ./.github/workflows/release.yml
with:
commit_sha: ${{ inputs.commit_sha }}
dry_run: true
secrets:
RELEASE_AUTOMATION_BOT_PAT: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }}
RELEASE_AUTOMATION_BOT_CRATESIO_TOKEN: ${{ secrets.RELEASE_AUTOMATION_BOT_CRATESIO_TOKEN }}

smithy-rs-scheduled-dry-run-release:
name: Scheduled dry run release
if: ${{ github.event_name == 'schedule' }}
uses: ./.github/workflows/release.yml
with:
commit_sha: main
dry_run: true
secrets:
RELEASE_AUTOMATION_BOT_PAT: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }}
RELEASE_AUTOMATION_BOT_CRATESIO_TOKEN: ${{ secrets.RELEASE_AUTOMATION_BOT_CRATESIO_TOKEN }}
29 changes: 29 additions & 0 deletions .github/workflows/prod-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

# This workflow performs a production smithy-rs release. It will cut a release tag in GitHub and publish to crates.io.
# It is idempotent (e.g. won't publish the same crates to crates.io twice), so we can run it repeatedly until it succeeds.

name: Smithy-rs prod release
run-name: ${{ github.workflow }} (${{ inputs.commit_sha }})
on:
workflow_dispatch:
inputs:
commit_sha:
description: |
Commit SHA: The SHA of the git commit that you want to release.
You must use the non-abbreviated SHA (e.g. b2318b0 won't work!).
Alternatively, you can use the name of a branch.
required: true
type: string

jobs:
smithy-rs-prod-release:
name: Prod release
uses: ./.github/workflows/release.yml
with:
commit_sha: ${{ inputs.commit_sha }}
dry_run: false
secrets:
RELEASE_AUTOMATION_BOT_PAT: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }}
RELEASE_AUTOMATION_BOT_CRATESIO_TOKEN: ${{ secrets.RELEASE_AUTOMATION_BOT_CRATESIO_TOKEN }}
20 changes: 10 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

# This workflow performs a release of smithy-rs. It is manually
# kicked off via GitHub Actions workflow dispatch.
# This is the shared release workflow run by both `prod-release.yml` and `dry-run-release.yml'.
# A calling workflow will indicate whether it wants to run this with a prod run or a dry run.

# Allow only one release to run at a time
concurrency:
Expand All @@ -13,22 +13,22 @@ env:
rust_version: 1.75.0

name: Release smithy-rs
run-name: ${{ inputs.dry_run && 'Dry run' || 'Prod run' }} - ${{ github.workflow }} (${{ inputs.commit_sha }})
on:
workflow_dispatch:
workflow_call:
inputs:
commit_sha:
description: |
Commit SHA: The SHA of the git commit that you want to release.
You must use the non-abbreviated SHA (e.g. b2318b0 won't work!).
description: The SHA of the git commit that you want to release.
required: true
type: string
dry_run:
description: |
Dry run: When selected, it only produces release artifacts, but will not cut a release tag in GitHub or publish to crates.io
description: When true, it only produces release artifacts, but will not cut a release tag in GitHub or publish to crates.io.
required: true
type: boolean
default: true
secrets:
RELEASE_AUTOMATION_BOT_PAT:
required: true
RELEASE_AUTOMATION_BOT_CRATESIO_TOKEN:
required: true

jobs:
check-actor-for-prod-run:
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.next.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
# references = ["smithy-rs#920"]
# meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client | server | all"}
# author = "rcoh"

[[smithy-rs]]
message = """
Stalled stream protection now supports request upload streams. It is currently off by default, but will be enabled by default in a future release. To enable it now, you can do the following:
Expand Down Expand Up @@ -53,6 +52,12 @@ references = ["smithy-rs#3485"]
meta = { "breaking" = false, "tada" = false, "bug" = true }
author = "jdisanti"

[[smithy-rs]]
message = "Unions with unit target member shape are now fully supported"
references = ["smithy-rs#2546"]
meta = { "breaking" = false, "tada" = false, "bug" = true, "target" = "all"}
author = "drganjoo"

[[aws-sdk-rust]]
message = "Upgraded MSRV to Rust 1.75"
references = ["smithy-rs#3553"]
Expand Down
Loading

0 comments on commit c484380

Please sign in to comment.