From bf538b6824c257b79301df3aa95e10bffa8e31be Mon Sep 17 00:00:00 2001 From: Zsolt Dollenstein Date: Mon, 23 Feb 2026 13:00:37 +0000 Subject: [PATCH] Bump cargo-dist to 0.30.4 (#18158) This PR was generated by: 1. bumping the version number in `dist-workspace.toml` 2. removing `dist.allow-dirty` in `dist-workspace.toml` 3. running `cargo dist generate` 4. adding back the `custom-publish-pypi` dependency for `custom-publish-crates` 5. reverting step 2 --- .github/workflows/check-release.yml | 2 +- .github/workflows/release.yml | 18 +++++++++--------- dist-workspace.toml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml index db41b0a20..70a8ca82a 100644 --- a/.github/workflows/check-release.yml +++ b/.github/workflows/check-release.yml @@ -15,7 +15,7 @@ jobs: - name: Install dist shell: bash - run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.2/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.4/cargo-dist-installer.sh | sh" - name: Run dist plan run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 27bde7968..d0cd66943 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,7 +59,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: persist-credentials: false submodules: recursive @@ -67,7 +67,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/axodotdev/cargo-dist/releases/download/v0.30.2/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.4/cargo-dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47 with: @@ -90,7 +90,7 @@ jobs: name: artifacts-plan-dist-manifest path: plan-dist-manifest.json - custom-build-binaries: + custom-build-release-binaries: needs: - plan if: ${{ needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload' || inputs.tag == 'dry-run' }} @@ -117,14 +117,14 @@ jobs: build-global-artifacts: needs: - plan - - custom-build-binaries + - custom-build-release-binaries - custom-build-docker runs-on: "depot-ubuntu-latest-4" env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: persist-credentials: false submodules: recursive @@ -164,18 +164,18 @@ jobs: host: needs: - plan - - custom-build-binaries + - custom-build-release-binaries - custom-build-docker - build-global-artifacts # Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine) - if: ${{ always() && needs.plan.result == 'success' && 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') }} + if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-release-binaries.result == 'skipped' || needs.custom-build-release-binaries.result == 'success') && (needs.custom-build-docker.result == 'skipped' || needs.custom-build-docker.result == 'success') }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} runs-on: "depot-ubuntu-latest-4" outputs: val: ${{ steps.host.outputs.manifest }} steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: persist-credentials: false submodules: recursive @@ -254,7 +254,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: persist-credentials: false submodules: recursive diff --git a/dist-workspace.toml b/dist-workspace.toml index 7280655cf..0ac151ea8 100644 --- a/dist-workspace.toml +++ b/dist-workspace.toml @@ -6,7 +6,7 @@ members = ["cargo:."] # See: #16989 allow-dirty = ["ci"] # The preferred dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.30.2" +cargo-dist-version = "0.30.4" # Whether to consider the binaries in a package for distribution (defaults true) dist = false # CI backends to support