forked from astral-sh/ruff
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate release workflow to
cargo-dist
(astral-sh#9559)
## Summary This PR migrates our release workflow to [`cargo-dist`](https://github.com/axodotdev/cargo-dist). The primary motivation here is that we want to ship dedicated installers for Ruff that work across platforms, and `cargo-dist` gives us those installers out-of-the-box. The secondary motivation is that `cargo-dist` formalizes some of the patterns that we've built up over time in our own release process. At a high level: - The `release.yml` file is generated by `cargo-dist` with `cargo dist generate`. It doesn't contain any modifications vis-a-vis the generated file. (If it's edited out of band from generation, the release fails.) - Our customizations are inserted as custom steps within the `cargo-dist` workflow. Specifically, `build-binaries` builds the wheels and packages them into binaries (as on `main`), while `build-docker.yml` builds the Docker image. `publish-pypi.yml` publishes the wheels to PyPI. This is effectively our `release.yaml` (on `main`), broken down into individual workflows rather than steps within a single workflow. ### Changes from `main` The workflow is _nearly_ unchanged. We kick off a release manually via the GitHub Action by providing a tag. If the tag doesn't match the `Cargo.toml`, the release fails. If the tag matches an already-existing release, the release fails. The release proceeds by (in order): 0. Doing some upfront validation via `cargo-dist`. 1. Creating the wheels and archives. 2. Building and pushing the Docker image. 3. Publishing to PyPI (if it's not a "dry run"). 4. Creating the GitHub Release (if it's not a "dry run"). 5. Notifying `ruff-pre-commit` (if it's not a "dry run"). There are a few changes in the workflow as compared to `main`: - **We no longer validate the SHA** (just the tag). It's not an input to the job. The Axo team is considering whether / how to support this. - **Releases are now published directly** (rather than as draft). Again, the Axo team is considering whether / how to support this. The downside of drafts is that the URLs aren't stable, so the installers don't work _as long as the release is in draft_. This is fine for our workflow. It seems like the Axo team will add it. - Releases already contain the latest entry from the changelog (we don't need to copy it over). This "Just Works", which is nice, though we'll still want to edit them to add contributors. There are also a few **breaking changes** for consumers of the binaries: - **We no longer include the version tag in the file name**. This enables users to install via `/latest` URLs on GitHub, and is part of the cargo-dist paradigm. - **Archives now include an extra level of nesting,** which you can remove with `--strip-components=1` when untarring. Here's an example release that I created -- I omitted all the artifacts since I was just testing a workflow, so none of the installers or links work, but it gives you a sense for what the release looks like: https://github.com/charliermarsh/cargodisttest/releases/tag/0.1.13. ### Test Plan I ran a successful release to completion last night, and installed Ruff via the installer:   The piece I'm least confident about is the Docker push. We build the image, but the push fails in my test repo since I haven't wired up the credentials.
- Loading branch information
1 parent
c9a283a
commit b0b68a5
Showing
9 changed files
with
542 additions
and
238 deletions.
There are no files selected for viewing
339 changes: 103 additions & 236 deletions
339
.github/workflows/release.yaml → .github/workflows/build-binaries.yml
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
# Build and publish a Docker image. | ||
# | ||
# Assumed to run as a subworkflow of .github/workflows/release.yml; specifically, as a local | ||
# artifacts job within `cargo-dist`. | ||
# | ||
# TODO(charlie): Ideally, the publish step would happen as a publish job within `cargo-dist`, but | ||
# sharing the built image as an artifact between jobs is challenging. | ||
name: "[ruff] Build Docker image" | ||
|
||
on: | ||
workflow_call: | ||
inputs: | ||
plan: | ||
required: true | ||
type: string | ||
pull_request: | ||
paths: | ||
- .github/workflows/build-docker.yml | ||
|
||
jobs: | ||
docker-publish: | ||
name: Build Docker image (ghcr.io/astral-sh/ruff) | ||
runs-on: ubuntu-latest | ||
environment: | ||
name: release | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: recursive | ||
|
||
- uses: docker/setup-buildx-action@v3 | ||
|
||
- uses: docker/login-action@v3 | ||
with: | ||
registry: ghcr.io | ||
username: ${{ github.repository_owner }} | ||
password: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
- name: Extract metadata (tags, labels) for Docker | ||
id: meta | ||
uses: docker/metadata-action@v5 | ||
with: | ||
images: ghcr.io/astral-sh/ruff | ||
|
||
- name: Check tag consistency | ||
if: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }} | ||
run: | | ||
version=$(grep "version = " pyproject.toml | sed -e 's/version = "\(.*\)"/\1/g') | ||
if [ "${{ fromJson(inputs.plan).announcement_tag }}" != "${version}" ]; then | ||
echo "The input tag does not match the version from pyproject.toml:" >&2 | ||
echo "${{ fromJson(inputs.plan).announcement_tag }}" >&2 | ||
echo "${version}" >&2 | ||
exit 1 | ||
else | ||
echo "Releasing ${version}" | ||
fi | ||
- name: "Build and push Docker image" | ||
uses: docker/build-push-action@v5 | ||
with: | ||
context: . | ||
platforms: linux/amd64,linux/arm64 | ||
# Reuse the builder | ||
cache-from: type=gha | ||
cache-to: type=gha,mode=max | ||
push: ${{ inputs.plan != '' && !fromJson(inputs.plan).announcement_tag_is_implicit }} | ||
tags: ghcr.io/astral-sh/ruff:latest,ghcr.io/astral-sh/ruff:${{ (inputs.plan != '' && fromJson(inputs.plan).announcement_tag) || 'dry-run' }} | ||
labels: ${{ steps.meta.outputs.labels }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
# Notify downstream repositories of a new release. | ||
# | ||
# Assumed to run as a subworkflow of .github/workflows/release.yml; specifically, as a post-announce | ||
# job within `cargo-dist`. | ||
name: "[ruff] Notify dependents" | ||
|
||
on: | ||
workflow_call: | ||
inputs: | ||
plan: | ||
required: true | ||
type: string | ||
|
||
jobs: | ||
update-dependents: | ||
name: Notify dependents | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: "Update pre-commit mirror" | ||
uses: actions/github-script@v7 | ||
with: | ||
github-token: ${{ secrets.RUFF_PRE_COMMIT_PAT }} | ||
script: | | ||
github.rest.actions.createWorkflowDispatch({ | ||
owner: 'astral-sh', | ||
repo: 'ruff-pre-commit', | ||
workflow_id: 'main.yml', | ||
ref: 'main', | ||
}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Publish a release to PyPI. | ||
# | ||
# Assumed to run as a subworkflow of .github/workflows/release.yml; specifically, as a publish job | ||
# within `cargo-dist`. | ||
name: "[ruff] Publish to PyPI" | ||
|
||
on: | ||
workflow_call: | ||
inputs: | ||
plan: | ||
required: true | ||
type: string | ||
|
||
jobs: | ||
pypi-publish: | ||
name: Upload to PyPI | ||
runs-on: ubuntu-latest | ||
environment: | ||
name: release | ||
permissions: | ||
# For PyPI's trusted publishing. | ||
id-token: write | ||
steps: | ||
- uses: actions/download-artifact@v4 | ||
with: | ||
pattern: wheels-* | ||
path: wheels | ||
merge-multiple: true | ||
- name: Publish to PyPi | ||
uses: pypa/gh-action-pypi-publish@release/v1 | ||
with: | ||
skip-existing: true | ||
packages-dir: wheels | ||
verbose: true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,246 @@ | ||
# Copyright 2022-2024, axodotdev | ||
# SPDX-License-Identifier: MIT or Apache-2.0 | ||
# | ||
# CI that: | ||
# | ||
# * checks for a Git Tag that looks like a release | ||
# * builds artifacts with cargo-dist (archives, installers, hashes) | ||
# * uploads those artifacts to temporary workflow zip | ||
# * on success, uploads the artifacts to a GitHub Release | ||
# | ||
# Note that the GitHub Release will be created with a generated | ||
# title/body based on your changelogs. | ||
|
||
name: Release | ||
|
||
permissions: | ||
contents: write | ||
|
||
# This task will run whenever you workflow_dispatch with a tag that looks like a version | ||
# like "1.0.0", "v0.1.0-prerelease.1", "my-app/0.1.0", "releases/v1.0.0", etc. | ||
# Various formats will be parsed into a VERSION and an optional PACKAGE_NAME, where | ||
# PACKAGE_NAME must be the name of a Cargo package in your workspace, and VERSION | ||
# must be a Cargo-style SemVer Version (must have at least major.minor.patch). | ||
# | ||
# If PACKAGE_NAME is specified, then the announcement will be for that | ||
# package (erroring out if it doesn't have the given version or isn't cargo-dist-able). | ||
# | ||
# If PACKAGE_NAME isn't specified, then the announcement will be for all | ||
# (cargo-dist-able) packages in the workspace with that version (this mode is | ||
# intended for workspaces with only one dist-able package, or with all dist-able | ||
# packages versioned/released in lockstep). | ||
# | ||
# If you push multiple tags at once, separate instances of this workflow will | ||
# spin up, creating an independent announcement for each one. However, GitHub | ||
# will hard limit this to 3 tags per commit, as it will assume more tags is a | ||
# mistake. | ||
# | ||
# If there's a prerelease-style suffix to the version, then the release(s) | ||
# will be marked as a prerelease. | ||
on: | ||
workflow_dispatch: | ||
inputs: | ||
tag: | ||
description: Release Tag | ||
required: true | ||
default: dry-run | ||
type: string | ||
|
||
jobs: | ||
# Run 'cargo dist plan' (or host) to determine what tasks we need to do | ||
plan: | ||
runs-on: ubuntu-latest | ||
outputs: | ||
val: ${{ steps.plan.outputs.manifest }} | ||
tag: ${{ (inputs.tag != 'dry-run' && inputs.tag) || '' }} | ||
tag-flag: ${{ inputs.tag && inputs.tag != 'dry-run' && format('--tag={0}', inputs.tag) || '' }} | ||
publishing: ${{ inputs.tag && inputs.tag != 'dry-run' }} | ||
env: | ||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: recursive | ||
- name: Install cargo-dist | ||
# we specify bash to get pipefail; it guards against the `curl` command | ||
# failing. otherwise `sh` won't catch that `curl` returned non-0 | ||
shell: bash | ||
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.14.0/cargo-dist-installer.sh | sh" | ||
# sure would be cool if github gave us proper conditionals... | ||
# so here's a doubly-nested ternary-via-truthiness to try to provide the best possible | ||
# functionality based on whether this is a pull_request, and whether it's from a fork. | ||
# (PRs run on the *source* but secrets are usually on the *target* -- that's *good* | ||
# but also really annoying to build CI around when it needs secrets to work right.) | ||
- id: plan | ||
run: | | ||
cargo dist ${{ (inputs.tag && inputs.tag != 'dry-run' && format('host --steps=create --tag={0}', inputs.tag)) || 'plan' }} --output-format=json > plan-dist-manifest.json | ||
echo "cargo dist ran successfully" | ||
cat plan-dist-manifest.json | ||
echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT" | ||
- name: "Upload dist-manifest.json" | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: artifacts-plan-dist-manifest | ||
path: plan-dist-manifest.json | ||
|
||
custom-build-binaries: | ||
needs: | ||
- plan | ||
if: ${{ needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload' || inputs.tag == 'dry-run' }} | ||
uses: ./.github/workflows/build-binaries.yml | ||
with: | ||
plan: ${{ needs.plan.outputs.val }} | ||
secrets: inherit | ||
|
||
custom-build-docker: | ||
needs: | ||
- plan | ||
if: ${{ needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload' || inputs.tag == 'dry-run' }} | ||
uses: ./.github/workflows/build-docker.yml | ||
with: | ||
plan: ${{ needs.plan.outputs.val }} | ||
secrets: inherit | ||
|
||
# Build and package all the platform-agnostic(ish) things | ||
build-global-artifacts: | ||
needs: | ||
- plan | ||
- custom-build-binaries | ||
- custom-build-docker | ||
runs-on: "ubuntu-20.04" | ||
env: | ||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: recursive | ||
- name: Install cargo-dist | ||
shell: bash | ||
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.14.0/cargo-dist-installer.sh | sh" | ||
# Get all the local artifacts for the global tasks to use (for e.g. checksums) | ||
- name: Fetch local artifacts | ||
uses: actions/download-artifact@v4 | ||
with: | ||
pattern: artifacts-* | ||
path: target/distrib/ | ||
merge-multiple: true | ||
- id: cargo-dist | ||
shell: bash | ||
run: | | ||
cargo dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json | ||
echo "cargo dist ran successfully" | ||
# Parse out what we just built and upload it to scratch storage | ||
echo "paths<<EOF" >> "$GITHUB_OUTPUT" | ||
jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT" | ||
echo "EOF" >> "$GITHUB_OUTPUT" | ||
cp dist-manifest.json "$BUILD_MANIFEST_NAME" | ||
- name: "Upload artifacts" | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
name: artifacts-build-global | ||
path: | | ||
${{ steps.cargo-dist.outputs.paths }} | ||
${{ env.BUILD_MANIFEST_NAME }} | ||
# Determines if we should publish/announce | ||
host: | ||
needs: | ||
- plan | ||
- custom-build-binaries | ||
- custom-build-docker | ||
- build-global-artifacts | ||
# Only run if we're "publishing", and only if local and global didn't fail (skipped is fine) | ||
if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') && (needs.custom-build-docker.result == 'skipped' || needs.custom-build-docker.result == 'success') }} | ||
env: | ||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
runs-on: "ubuntu-20.04" | ||
outputs: | ||
val: ${{ steps.host.outputs.manifest }} | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: recursive | ||
- name: Install cargo-dist | ||
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.14.0/cargo-dist-installer.sh | sh" | ||
# Fetch artifacts from scratch-storage | ||
- name: Fetch artifacts | ||
uses: actions/download-artifact@v4 | ||
with: | ||
pattern: artifacts-* | ||
path: target/distrib/ | ||
merge-multiple: true | ||
# This is a harmless no-op for GitHub Releases, hosting for that happens in "announce" | ||
- id: host | ||
shell: bash | ||
run: | | ||
cargo dist host ${{ needs.plan.outputs.tag-flag }} --steps=upload --steps=release --output-format=json > dist-manifest.json | ||
echo "artifacts uploaded and released successfully" | ||
cat dist-manifest.json | ||
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT" | ||
- name: "Upload dist-manifest.json" | ||
uses: actions/upload-artifact@v4 | ||
with: | ||
# Overwrite the previous copy | ||
name: artifacts-dist-manifest | ||
path: dist-manifest.json | ||
|
||
custom-publish-pypi: | ||
needs: | ||
- plan | ||
- host | ||
if: ${{ !fromJson(needs.plan.outputs.val).announcement_is_prerelease || fromJson(needs.plan.outputs.val).publish_prereleases }} | ||
uses: ./.github/workflows/publish-pypi.yml | ||
with: | ||
plan: ${{ needs.plan.outputs.val }} | ||
secrets: inherit | ||
# publish jobs get escalated permissions | ||
permissions: | ||
id-token: write | ||
packages: write | ||
|
||
# Create a GitHub Release while uploading all files to it | ||
announce: | ||
needs: | ||
- plan | ||
- host | ||
- custom-publish-pypi | ||
# use "always() && ..." to allow us to wait for all publish jobs while | ||
# still allowing individual publish jobs to skip themselves (for prereleases). | ||
# "host" however must run to completion, no skipping allowed! | ||
if: ${{ always() && needs.host.result == 'success' && (needs.custom-publish-pypi.result == 'skipped' || needs.custom-publish-pypi.result == 'success') }} | ||
runs-on: "ubuntu-20.04" | ||
env: | ||
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
steps: | ||
- uses: actions/checkout@v4 | ||
with: | ||
submodules: recursive | ||
- name: "Download GitHub Artifacts" | ||
uses: actions/download-artifact@v4 | ||
with: | ||
pattern: artifacts-* | ||
path: artifacts | ||
merge-multiple: true | ||
- name: Cleanup | ||
run: | | ||
# Remove the granular manifests | ||
rm -f artifacts/*-dist-manifest.json | ||
- name: Create GitHub Release | ||
uses: ncipollo/release-action@v1 | ||
with: | ||
tag: ${{ needs.plan.outputs.tag }} | ||
name: ${{ fromJson(needs.host.outputs.val).announcement_title }} | ||
body: ${{ fromJson(needs.host.outputs.val).announcement_github_body }} | ||
prerelease: ${{ fromJson(needs.host.outputs.val).announcement_is_prerelease }} | ||
artifacts: "artifacts/*" | ||
|
||
custom-notify-dependents: | ||
needs: | ||
- plan | ||
- announce | ||
uses: ./.github/workflows/notify-dependents.yml | ||
with: | ||
plan: ${{ needs.plan.outputs.val }} | ||
secrets: inherit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# Auto-generated by `cargo-dist`. | ||
.github/workflows/release.yml |
Oops, something went wrong.