From 6263d1008d4ec5bb4393d6f5a39c1d2294b6173a Mon Sep 17 00:00:00 2001
From: samypr100 <3933065+samypr100@users.noreply.github.com>
Date: Mon, 22 Sep 2025 13:20:06 -0400
Subject: [PATCH] Re-upstream to dist to axodotdev/cargo-dist (#15798)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

Both https://github.com/axodotdev/cargo-dist/releases/tag/v0.29.0 and
https://github.com/axodotdev/cargo-dist/releases/tag/v0.30.0 seem to
contain all relevant changes from
https://github.com/astral-sh/cargo-dist

## Test Plan

Not tested yet given I'd be running from a fork, but a dry-run run from
astral-sh/uv would be great 😅
---
 .github/workflows/release.yml | 5 ++---
 dist-workspace.toml           | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1fae60ff3..f19cefcb8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,7 +1,6 @@
-# This file was autogenerated by dist: https://github.com/astral-sh/cargo-dist
+# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist
 #
 # Copyright 2022-2024, axodotdev
-# Copyright 2025 Astral Software Inc.
 # SPDX-License-Identifier: MIT or Apache-2.0
 #
 # CI that:
@@ -69,7 +68,7 @@ jobs:
         # 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/astral-sh/cargo-dist/releases/download/v0.28.7/cargo-dist-installer.sh | sh"
+        run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.0/cargo-dist-installer.sh | sh"
       - name: Cache dist
         uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47
         with:
diff --git a/dist-workspace.toml b/dist-workspace.toml
index 60e3001d3..c7493e920 100644
--- a/dist-workspace.toml
+++ b/dist-workspace.toml
@@ -4,8 +4,8 @@ members = ["cargo:."]
 # Config for 'dist'
 [dist]
 # The preferred dist version to use in CI (Cargo.toml SemVer syntax)
-cargo-dist-version = "0.28.7"
-# make a package being included in our releases opt-in instead of opt-out
+cargo-dist-version = "0.30.0"
+# Whether to consider the binaries in a package for distribution (defaults true)
 dist = false
 # CI backends to support
 ci = "github"