Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade cargo-dist from 0.22.1 => 0.25.2-prerelease.3 (#14456) 

Needed to prevent updater failures when doing
https://github.com/astral-sh/ruff/issues/13927

See 

- https://github.com/axodotdev/axoupdater/issues/210
- https://github.com/axodotdev/cargo-dist/pull/1538
- https://github.com/astral-sh/uv/pull/8958
This commit is contained in:
Zanie Blue 2024-11-19 08:49:27 -06:00 committed by Micha Reiser
parent 11d20a1a51
commit 844c07f1f0
2 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.github/workflows/release.yml vendored
View File

@ -1,4 +1,4 @@
# This file was autogenerated by cargo-dist: https://opensource.axo.dev/cargo-dist/ # This file was autogenerated by dist: https://opensource.axo.dev/cargo-dist/
# #
# Copyright 2022-2024, axodotdev # Copyright 2022-2024, axodotdev
# SPDX-License-Identifier: MIT or Apache-2.0 # SPDX-License-Identifier: MIT or Apache-2.0
@ -6,7 +6,7 @@
# CI that: # CI that:
# #
# * checks for a Git Tag that looks like a release # * checks for a Git Tag that looks like a release
# * builds artifacts with cargo-dist (archives, installers, hashes) # * builds artifacts with dist (archives, installers, hashes)
# * uploads those artifacts to temporary workflow zip # * uploads those artifacts to temporary workflow zip
# * on success, uploads the artifacts to a GitHub Release # * on success, uploads the artifacts to a GitHub Release
# #
@ -24,10 +24,10 @@ permissions:
# must be a Cargo-style SemVer Version (must have at least major.minor.patch). # 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 # 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). # package (erroring out if it doesn't have the given version or isn't dist-able).
# #
# If PACKAGE_NAME isn't specified, then the announcement will be for all # 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 # (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 # intended for workspaces with only one dist-able package, or with all dist-able
# packages versioned/released in lockstep). # packages versioned/released in lockstep).
# #
@ -48,7 +48,7 @@ on:
type: string type: string
jobs: jobs:
# Run 'cargo dist plan' (or host) to determine what tasks we need to do # Run 'dist plan' (or host) to determine what tasks we need to do
plan: plan:
runs-on: "ubuntu-20.04" runs-on: "ubuntu-20.04"
outputs: outputs:
@ -62,16 +62,16 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- name: Install cargo-dist - name: Install dist
# we specify bash to get pipefail; it guards against the `curl` command # we specify bash to get pipefail; it guards against the `curl` command
# failing. otherwise `sh` won't catch that `curl` returned non-0 # failing. otherwise `sh` won't catch that `curl` returned non-0
shell: bash shell: bash
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.22.1/cargo-dist-installer.sh | sh" run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.25.2-prerelease.3/cargo-dist-installer.sh | sh"
- name: Cache cargo-dist - name: Cache dist
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: cargo-dist-cache name: cargo-dist-cache
path: ~/.cargo/bin/cargo-dist path: ~/.cargo/bin/dist
# sure would be cool if github gave us proper conditionals... # 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 # 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. # functionality based on whether this is a pull_request, and whether it's from a fork.
@ -79,8 +79,8 @@ jobs:
# but also really annoying to build CI around when it needs secrets to work right.) # but also really annoying to build CI around when it needs secrets to work right.)
- id: plan - id: plan
run: | 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 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" echo "dist ran successfully"
cat plan-dist-manifest.json cat plan-dist-manifest.json
echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT" echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT"
- name: "Upload dist-manifest.json" - name: "Upload dist-manifest.json"
@ -124,12 +124,12 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- name: Install cached cargo-dist - name: Install cached dist
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: cargo-dist-cache name: cargo-dist-cache
path: ~/.cargo/bin/ path: ~/.cargo/bin/
- run: chmod +x ~/.cargo/bin/cargo-dist - run: chmod +x ~/.cargo/bin/dist
# Get all the local artifacts for the global tasks to use (for e.g. checksums) # Get all the local artifacts for the global tasks to use (for e.g. checksums)
- name: Fetch local artifacts - name: Fetch local artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
@ -140,8 +140,8 @@ jobs:
- id: cargo-dist - id: cargo-dist
shell: bash shell: bash
run: | run: |
cargo dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json
echo "cargo dist ran successfully" echo "dist ran successfully"
# Parse out what we just built and upload it to scratch storage # Parse out what we just built and upload it to scratch storage
echo "paths<<EOF" >> "$GITHUB_OUTPUT" echo "paths<<EOF" >> "$GITHUB_OUTPUT"
@ -174,12 +174,12 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
submodules: recursive submodules: recursive
- name: Install cached cargo-dist - name: Install cached dist
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
name: cargo-dist-cache name: cargo-dist-cache
path: ~/.cargo/bin/ path: ~/.cargo/bin/
- run: chmod +x ~/.cargo/bin/cargo-dist - run: chmod +x ~/.cargo/bin/dist
# Fetch artifacts from scratch-storage # Fetch artifacts from scratch-storage
- name: Fetch artifacts - name: Fetch artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
@ -191,7 +191,7 @@ jobs:
- id: host - id: host
shell: bash shell: bash
run: | run: |
cargo dist host ${{ needs.plan.outputs.tag-flag }} --steps=upload --steps=release --output-format=json > dist-manifest.json dist host ${{ needs.plan.outputs.tag-flag }} --steps=upload --steps=release --output-format=json > dist-manifest.json
echo "artifacts uploaded and released successfully" echo "artifacts uploaded and released successfully"
cat dist-manifest.json cat dist-manifest.json
echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT" echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT"

16
Cargo.toml
View File

@ -248,10 +248,10 @@ debug = 1
[profile.dist] [profile.dist]
inherits = "release" inherits = "release"
# Config for 'cargo dist' # Config for 'dist'
[workspace.metadata.dist] [workspace.metadata.dist]
# The preferred cargo-dist version to use in CI (Cargo.toml SemVer syntax) # The preferred dist version to use in CI (Cargo.toml SemVer syntax)
cargo-dist-version = "0.22.1" cargo-dist-version = "0.25.2-prerelease.3"
# CI backends to support # CI backends to support
ci = "github" ci = "github"
# The installers to generate for each app # The installers to generate for each app
@ -282,13 +282,13 @@ targets = [
] ]
# Whether to auto-include files like READMEs, LICENSEs, and CHANGELOGs (default true) # Whether to auto-include files like READMEs, LICENSEs, and CHANGELOGs (default true)
auto-includes = false auto-includes = false
# Whether cargo-dist should create a GitHub Release or use an existing draft # Whether dist should create a Github Release or use an existing draft
create-release = true create-release = true
# Which actions to run on pull requests # Which actions to run on pull requests
pr-run-mode = "skip" pr-run-mode = "skip"
# Whether CI should trigger releases with dispatches instead of tag pushes # Whether CI should trigger releases with dispatches instead of tag pushes
dispatch-releases = true dispatch-releases = true
# Which phase cargo-dist should use to create the GitHub release # Which phase dist should use to create the GitHub release
github-release = "announce" github-release = "announce"
# Whether CI should include auto-generated code to build local artifacts # Whether CI should include auto-generated code to build local artifacts
build-local-artifacts = false build-local-artifacts = false
@ -297,11 +297,7 @@ local-artifacts-jobs = ["./build-binaries", "./build-docker"]
# Publish jobs to run in CI # Publish jobs to run in CI
publish-jobs = ["./publish-pypi", "./publish-wasm"] publish-jobs = ["./publish-pypi", "./publish-wasm"]
# Post-announce jobs to run in CI # Post-announce jobs to run in CI
post-announce-jobs = [ post-announce-jobs = ["./notify-dependents", "./publish-docs", "./publish-playground"]
"./notify-dependents",
"./publish-docs",
"./publish-playground",
]
# Custom permissions for GitHub Jobs # Custom permissions for GitHub Jobs
github-custom-job-permissions = { "build-docker" = { packages = "write", contents = "read" }, "publish-wasm" = { contents = "read", id-token = "write", packages = "write" } } github-custom-job-permissions = { "build-docker" = { packages = "write", contents = "read" }, "publish-wasm" = { contents = "read", id-token = "write", packages = "write" } }
# Whether to install an updater program # Whether to install an updater program